always retain doc-src (as regular component);
authorwenzelm
Tue Aug 14 10:44:03 2012 +0200 (2012-08-14)
changeset 487906e739225dd8a
parent 48789 7476665f3e0f
child 48791 9e8f30bfbdca
always retain doc-src (as regular component);
Admin/Release/makedist
Admin/isatest/isatest-makedist
etc/components
lib/scripts/getsettings
     1.1 --- a/Admin/Release/makedist	Mon Aug 13 20:31:24 2012 +0200
     1.2 +++ b/Admin/Release/makedist	Tue Aug 14 10:44:03 2012 +0200
     1.3 @@ -23,7 +23,6 @@
     1.4  Usage: $PRG [OPTIONS] [VERSION]
     1.5  
     1.6    Options are:
     1.7 -    -D                 retain doc-src component
     1.8      -j JEDIT_BUILD     build Isabelle/jEdit via given jedit_build component
     1.9      -r RELEASE         proper release with name"
    1.10  
    1.11 @@ -47,16 +46,12 @@
    1.12  
    1.13  # options
    1.14  
    1.15 -RETAIN_DOC_SRC=""
    1.16  RELEASE=""
    1.17  ISABELLE_JEDIT_BUILD_HOME=""
    1.18  
    1.19 -while getopts "Dj:r:" OPT
    1.20 +while getopts "j:r:" OPT
    1.21  do
    1.22    case "$OPT" in
    1.23 -    D)
    1.24 -      RETAIN_DOC_SRC=true
    1.25 -      ;;
    1.26      j)
    1.27        ISABELLE_JEDIT_BUILD_HOME="$OPTARG"
    1.28        ;;
    1.29 @@ -152,9 +147,7 @@
    1.30  
    1.31  perl -pi -e 's/^(ISABELLE_SCALA_BUILD_OPTIONS=")/$1-optimise /,' etc/settings
    1.32  
    1.33 -if [ -n "$RETAIN_DOC_SRC" ]; then
    1.34 -  cp -a doc-src doc-src.orig
    1.35 -fi
    1.36 +cp -a doc-src doc-src.orig
    1.37  
    1.38  ./Admin/build all || fail "Failed to build distribution"
    1.39  
    1.40 @@ -174,9 +167,7 @@
    1.41  rm doc/adaptation.dvi doc/adaptation.pdf doc/architecture.dvi doc/architecture.pdf
    1.42  rm -rf doc-src
    1.43  
    1.44 -if [ -n "$RETAIN_DOC_SRC" ]; then
    1.45 -  mv doc-src.orig doc-src
    1.46 -fi
    1.47 +mv doc-src.orig doc-src
    1.48  
    1.49  mkdir -p contrib
    1.50  cat >contrib/README <<EOF
     2.1 --- a/Admin/isatest/isatest-makedist	Mon Aug 13 20:31:24 2012 +0200
     2.2 +++ b/Admin/isatest/isatest-makedist	Tue Aug 14 10:44:03 2012 +0200
     2.3 @@ -60,7 +60,7 @@
     2.4  
     2.5  echo "### building distribution"  >> $DISTLOG 2>&1
     2.6  mkdir -p $DISTPREFIX
     2.7 -$MAKEDIST -D -j "/home/isabelle/contrib_devel/jedit_build-20120414" >> $DISTLOG 2>&1
     2.8 +$MAKEDIST -j "/home/isabelle/contrib_devel/jedit_build-20120414" >> $DISTLOG 2>&1
     2.9  
    2.10  if [ $? -ne 0 ]
    2.11  then
     3.1 --- a/etc/components	Mon Aug 13 20:31:24 2012 +0200
     3.2 +++ b/etc/components	Tue Aug 14 10:44:03 2012 +0200
     3.3 @@ -10,6 +10,7 @@
     3.4  src/LCF
     3.5  src/Sequents
     3.6  #misc components
     3.7 +doc-src
     3.8  src/Tools/Code
     3.9  src/Tools/jEdit
    3.10  src/Tools/WWW_Find
     4.1 --- a/lib/scripts/getsettings	Mon Aug 13 20:31:24 2012 +0200
     4.2 +++ b/lib/scripts/getsettings	Tue Aug 14 10:44:03 2012 +0200
     4.3 @@ -197,7 +197,6 @@
     4.4  
     4.5  #main components
     4.6  init_component "$ISABELLE_HOME"
     4.7 -[ -d "$ISABELLE_HOME/doc-src" ] && init_component "$ISABELLE_HOME/doc-src"
     4.8  [ -d "$ISABELLE_HOME/Admin" ] && init_component "$ISABELLE_HOME/Admin"
     4.9  [ -d "$ISABELLE_HOME_USER" ] && init_component "$ISABELLE_HOME_USER"
    4.10