--- a/Admin/Release/makedist Mon Aug 13 20:31:24 2012 +0200
+++ b/Admin/Release/makedist Tue Aug 14 10:44:03 2012 +0200
@@ -23,7 +23,6 @@
Usage: $PRG [OPTIONS] [VERSION]
Options are:
- -D retain doc-src component
-j JEDIT_BUILD build Isabelle/jEdit via given jedit_build component
-r RELEASE proper release with name"
@@ -47,16 +46,12 @@
# options
-RETAIN_DOC_SRC=""
RELEASE=""
ISABELLE_JEDIT_BUILD_HOME=""
-while getopts "Dj:r:" OPT
+while getopts "j:r:" OPT
do
case "$OPT" in
- D)
- RETAIN_DOC_SRC=true
- ;;
j)
ISABELLE_JEDIT_BUILD_HOME="$OPTARG"
;;
@@ -152,9 +147,7 @@
perl -pi -e 's/^(ISABELLE_SCALA_BUILD_OPTIONS=")/$1-optimise /,' etc/settings
-if [ -n "$RETAIN_DOC_SRC" ]; then
- cp -a doc-src doc-src.orig
-fi
+cp -a doc-src doc-src.orig
./Admin/build all || fail "Failed to build distribution"
@@ -174,9 +167,7 @@
rm doc/adaptation.dvi doc/adaptation.pdf doc/architecture.dvi doc/architecture.pdf
rm -rf doc-src
-if [ -n "$RETAIN_DOC_SRC" ]; then
- mv doc-src.orig doc-src
-fi
+mv doc-src.orig doc-src
mkdir -p contrib
cat >contrib/README <<EOF
--- a/Admin/isatest/isatest-makedist Mon Aug 13 20:31:24 2012 +0200
+++ b/Admin/isatest/isatest-makedist Tue Aug 14 10:44:03 2012 +0200
@@ -60,7 +60,7 @@
echo "### building distribution" >> $DISTLOG 2>&1
mkdir -p $DISTPREFIX
-$MAKEDIST -D -j "/home/isabelle/contrib_devel/jedit_build-20120414" >> $DISTLOG 2>&1
+$MAKEDIST -j "/home/isabelle/contrib_devel/jedit_build-20120414" >> $DISTLOG 2>&1
if [ $? -ne 0 ]
then
--- a/etc/components Mon Aug 13 20:31:24 2012 +0200
+++ b/etc/components Tue Aug 14 10:44:03 2012 +0200
@@ -10,6 +10,7 @@
src/LCF
src/Sequents
#misc components
+doc-src
src/Tools/Code
src/Tools/jEdit
src/Tools/WWW_Find
--- a/lib/scripts/getsettings Mon Aug 13 20:31:24 2012 +0200
+++ b/lib/scripts/getsettings Tue Aug 14 10:44:03 2012 +0200
@@ -197,7 +197,6 @@
#main components
init_component "$ISABELLE_HOME"
-[ -d "$ISABELLE_HOME/doc-src" ] && init_component "$ISABELLE_HOME/doc-src"
[ -d "$ISABELLE_HOME/Admin" ] && init_component "$ISABELLE_HOME/Admin"
[ -d "$ISABELLE_HOME_USER" ] && init_component "$ISABELLE_HOME_USER"