Mercurial Mercurial > wneuper > isa / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | gz | help
outermost directory structure for Windows/Cygwin;
authorwenzelm
Thu, 10 Jan 2013 20:41:52 +0100
changeset 5182576967aa4fe84
parent 51824 6e77cfc21fc1
child 51826 d02b9918e4d4
outermost directory structure for Windows/Cygwin;
Admin/Windows/Cygwin/Cygwin-Setup.bat file | annotate | diff | comparison | revisions
Admin/Windows/Cygwin/Cygwin-Terminal.bat file | annotate | diff | comparison | revisions
Admin/Windows/Cygwin/sfx.txt file | annotate | diff | comparison | revisions
Admin/lib/Tools/makedist_bundles file | annotate | diff | comparison | revisions 
     1.1 --- a/Admin/Windows/Cygwin/Cygwin-Setup.bat	Thu Jan 10 20:23:16 2013 +0100
     1.2 +++ b/Admin/Windows/Cygwin/Cygwin-Setup.bat	Thu Jan 10 20:41:52 2013 +0100
     1.3 @@ -1,4 +1,4 @@
     1.4  @echo off
     1.5  
     1.6 -"%CD%\contrib\cygwin-1.7.9\setup" --site http://isabelle.in.tum.de/cygwin --no-verify --only-site --local-package-dir "%TEMP%" --root "%CD%\contrib\cygwin-1.7.9"
     1.7 +"%CD%\cygwin\isabelle\cygwin" --site http://isabelle.in.tum.de/cygwin_2013 --no-verify --only-site --local-package-dir "%TEMP%" --root "%CD%\cygwin"
     1.8  

     2.1 --- a/Admin/Windows/Cygwin/Cygwin-Terminal.bat	Thu Jan 10 20:23:16 2013 +0100
     2.2 +++ b/Admin/Windows/Cygwin/Cygwin-Terminal.bat	Thu Jan 10 20:41:52 2013 +0100
     2.3 @@ -6,4 +6,4 @@
     2.4  
     2.5  echo This is the GNU Bash interpreter of Cygwin.
     2.6  echo Use command "isabelle" to invoke Isabelle tools.
     2.7 -"%CD%\contrib\cygwin-1.7.9\bin\bash" --login -i
     2.8 +"%CD%\cygwin\bin\bash" --login -i

     3.1 --- a/Admin/Windows/Cygwin/sfx.txt	Thu Jan 10 20:23:16 2013 +0100
     3.2 +++ b/Admin/Windows/Cygwin/sfx.txt	Thu Jan 10 20:41:52 2013 +0100
     3.3 @@ -1,9 +1,9 @@
     3.4  ;!@Install@!UTF-8!
     3.5  GUIFlags="64"
     3.6  InstallPath="%UserDesktop%"
     3.7 -BeginPrompt="Unpack Isabelle2012?"
     3.8 +BeginPrompt="Unpack Isabelle2013?"
     3.9  ExtractPathText="Target directory"
    3.10 -ExtractTitle="Unpacking Isabelle2012 ..."
    3.11 -Shortcut="Du,{%%T\Isabelle2012\Isabelle.exe},{},{},{},{},{%%T\Isabelle2012}"
    3.12 -RunProgram="\"%%T\Isabelle2012\contrib\cygwin-1.7.9\init.bat\""
    3.13 +ExtractTitle="Unpacking Isabelle2013 ..."
    3.14 +Shortcut="Du,{%%T\Isabelle2013\Isabelle2013.exe},{},{},{},{},{%%T\Isabelle2013}"
    3.15 +RunProgram="\"%%T\Isabelle2013\cygwin\init.bat\""
    3.16  ;!@InstallEnd@!

     4.1 --- a/Admin/lib/Tools/makedist_bundles	Thu Jan 10 20:23:16 2013 +0100
     4.2 +++ b/Admin/lib/Tools/makedist_bundles	Thu Jan 10 20:41:52 2013 +0100
     4.3 @@ -117,12 +117,11 @@
     4.4      perl -pi -e "s,lookAndFeel=.*,lookAndFeel=com.sun.java.swing.plaf.windows.WindowsLookAndFeel,g;" \
     4.5        "$TMP/$ISABELLE_NAME/src/Tools/jEdit/dist/properties/jEdit.props"
     4.6  
     4.7 -# FIXME include cygwin.tar.gz etc.
     4.8 -#
     4.9 -#    TAR="$ARCHIVE_DIR/contrib/windows/Isabelle.tar"
    4.10 -#    [ -e "$TAR" ] || fail "Missing $TAR"
    4.11 -#    rm -f "$ISABELLE_TARGET/Isabelle"
    4.12 -#    tar -C "$ISABELLE_TARGET" -xv -f "$TAR"
    4.13 +    # FIXME cygwin.tar.gz
    4.14 +
    4.15 +    cp "$ISABELLE_HOME/Admin/Windows/launch4j/Isabelle.exe" "$ISABELLE_TARGET/Isabelle2013.exe"
    4.16 +    cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" \
    4.17 +      "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" "$ISABELLE_TARGET"
    4.18  
    4.19      for NAME in ANNOUNCE README NEWS COPYRIGHT CONTRIBUTORS contrib/README
    4.20      do
wneuper/isa