merged
authorwenzelm
Thu Jan 17 23:00:20 2013 +0100 (2013-01-17)
changeset 5096323ed79fc2b4d
parent 50955 ada575c605e1
parent 50962 157d90cdcef0
child 50964 2a990baa09af
merged
     1.1 --- a/Admin/Release/CHECKLIST	Thu Jan 17 08:31:16 2013 -0800
     1.2 +++ b/Admin/Release/CHECKLIST	Thu Jan 17 23:00:20 2013 +0100
     1.3 @@ -11,9 +11,9 @@
     1.4  
     1.5  - test Proof General 4.1, 3.7.1.1;
     1.6  
     1.7 -- check HTML header of library;
     1.8 +- test 'display_drafts' command;
     1.9  
    1.10 -- check CTRL-C, SIGINT in tty (also for external processes);
    1.11 +- check HTML header of library;
    1.12  
    1.13  - check persistent sessions with PG and Poly/ML 5.x;
    1.14  
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/Admin/Windows/Cygwin/Cygwin-Latex-Setup.bat	Thu Jan 17 23:00:20 2013 +0100
     2.3 @@ -0,0 +1,4 @@
     2.4 +@echo off
     2.5 +
     2.6 +"%CD%\contrib\cygwin\isabelle\cygwin" --site http://isabelle.in.tum.de/cygwin_2013 --no-verify --only-site --local-package-dir "%TEMP%" --root "%CD%\contrib\cygwin" --packages texlive-collection-latexextra,texlive-collection-fontutils,texlive-collection-mathextra,libsasl2 --quiet-mode
     2.7 +
     3.1 Binary file Admin/Windows/launch4j/Isabelle.exe has changed
     4.1 --- a/Admin/Windows/launch4j/isabelle.xml	Thu Jan 17 08:31:16 2013 -0800
     4.2 +++ b/Admin/Windows/launch4j/isabelle.xml	Thu Jan 17 23:00:20 2013 +0100
     4.3 @@ -20,7 +20,7 @@
     4.4      <cp>%EXEDIR%\lib\classes\ext\scala-swing.jar</cp>
     4.5    </classPath>
     4.6    <jre>
     4.7 -    <path>%EXEDIR%\contrib\jdk-7u9\x86-cygwin\jdk1.7.0_09</path>
     4.8 +    <path>%EXEDIR%\contrib\jdk-7u11\x86-cygwin\jdk1.7.0_11</path>
     4.9      <minVersion></minVersion>
    4.10      <maxVersion></maxVersion>
    4.11      <jdkPreference>jdkOnly</jdkPreference>
     5.1 --- a/Admin/components/bundled-windows	Thu Jan 17 08:31:16 2013 -0800
     5.2 +++ b/Admin/components/bundled-windows	Thu Jan 17 23:00:20 2013 +0100
     5.3 @@ -1,3 +1,2 @@
     5.4  #additional components to be bundled for release
     5.5 -cygwin-20130114
     5.6 -
     5.7 +cygwin-20130117
     6.1 --- a/Admin/components/components.sha1	Thu Jan 17 08:31:16 2013 -0800
     6.2 +++ b/Admin/components/components.sha1	Thu Jan 17 23:00:20 2013 +0100
     6.3 @@ -4,6 +4,7 @@
     6.4  2f6417b8e96a0e4e8354fe0f1a253c18fb55d9a7  cvc3-2.4.1.tar.gz
     6.5  842d9526f37b928cf9e22f141884365129990d63  cygwin-20130110.tar.gz
     6.6  cb3b0706d208f104b800267697204f6d82f7b48a  cygwin-20130114.tar.gz
     6.7 +3b44cca04855016d5f8cfb5101b2e0579ab80197  cygwin-20130117.tar.gz
     6.8  0fe549949a025d65d52d6deca30554de8fca3b6e  e-1.5.tar.gz
     6.9  2e293256a134eb8e5b1a283361b15eb812fbfbf1  e-1.6-1.tar.gz
    6.10  e1919e72416cbd7ac8de5455caba8901acc7b44d  e-1.6-2.tar.gz
     7.1 --- a/Admin/lib/Tools/makedist_bundles	Thu Jan 17 08:31:16 2013 -0800
     7.2 +++ b/Admin/lib/Tools/makedist_bundles	Thu Jan 17 23:00:20 2013 +0100
     7.3 @@ -125,6 +125,7 @@
     7.4  
     7.5      cp "$ISABELLE_HOME/Admin/Windows/launch4j/Isabelle.exe" "$ISABELLE_TARGET/Isabelle2013.exe"
     7.6      cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" \
     7.7 +      "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Latex-Setup.bat" \
     7.8        "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" "$ISABELLE_TARGET"
     7.9  
    7.10      for NAME in init.bat postinstall rebaseall
     8.1 --- a/Admin/lib/Tools/makedist_cygwin	Thu Jan 17 08:31:16 2013 -0800
     8.2 +++ b/Admin/lib/Tools/makedist_cygwin	Thu Jan 17 23:00:20 2013 +0100
     8.3 @@ -77,3 +77,4 @@
     8.4  
     8.5  DATE=$(date +%Y%m%d)
     8.6  tar -C "$TARGET/.." -cz -f "cygwin-${DATE}.tar.gz" cygwin
     8.7 +