# HG changeset patch # User wenzelm # Date 1357907031 -3600 # Node ID 7784cc660580ef02e9e3dbb472879cc28070565e # Parent 5d4852f1b952aff0729bc5a0ca04e414cdac6059 more standard contrib/cygwin location (again); diff -r 5d4852f1b952 -r 7784cc660580 Admin/Windows/Cygwin/Cygwin-Setup.bat --- a/Admin/Windows/Cygwin/Cygwin-Setup.bat Fri Jan 11 08:17:47 2013 +0100 +++ b/Admin/Windows/Cygwin/Cygwin-Setup.bat Fri Jan 11 13:23:51 2013 +0100 @@ -1,4 +1,4 @@ @echo off -"%CD%\cygwin\isabelle\cygwin" --site http://isabelle.in.tum.de/cygwin_2013 --no-verify --only-site --local-package-dir "%TEMP%" --root "%CD%\cygwin" +"%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" diff -r 5d4852f1b952 -r 7784cc660580 Admin/Windows/Cygwin/Cygwin-Terminal.bat --- a/Admin/Windows/Cygwin/Cygwin-Terminal.bat Fri Jan 11 08:17:47 2013 +0100 +++ b/Admin/Windows/Cygwin/Cygwin-Terminal.bat Fri Jan 11 13:23:51 2013 +0100 @@ -6,4 +6,4 @@ echo This is the GNU Bash interpreter of Cygwin. echo Use command "isabelle" to invoke Isabelle tools. -"%CD%\cygwin\bin\bash" --login -i +"%CD%\contrib\cygwin\bin\bash" --login -i diff -r 5d4852f1b952 -r 7784cc660580 Admin/Windows/Cygwin/isabelle/init.bat --- a/Admin/Windows/Cygwin/isabelle/init.bat Fri Jan 11 08:17:47 2013 +0100 +++ b/Admin/Windows/Cygwin/isabelle/init.bat Fri Jan 11 13:23:51 2013 +0100 @@ -6,6 +6,6 @@ set CYGWIN=nodosfilewarning echo Initializing Cygwin ... -"cygwin\bin\dash" /isabelle/rebaseall contrib/polyml-5.5.0 -"cygwin\bin\bash" /isabelle/postinstall +"contrib\cygwin\bin\dash" /isabelle/rebaseall contrib/polyml-5.5.0 +"contrib\cygwin\bin\bash" /isabelle/postinstall diff -r 5d4852f1b952 -r 7784cc660580 Admin/Windows/Cygwin/sfx.txt --- a/Admin/Windows/Cygwin/sfx.txt Fri Jan 11 08:17:47 2013 +0100 +++ b/Admin/Windows/Cygwin/sfx.txt Fri Jan 11 13:23:51 2013 +0100 @@ -5,5 +5,5 @@ ExtractPathText="Target directory" ExtractTitle="Unpacking Isabelle2013 ..." Shortcut="Du,{%%T\Isabelle2013\Isabelle2013.exe},{},{},{},{},{%%T\Isabelle2013}" -RunProgram="\"%%T\Isabelle2013\cygwin\init.bat\"" +RunProgram="\"%%T\Isabelle2013\contrib\cygwin\init.bat\"" ;!@InstallEnd@! diff -r 5d4852f1b952 -r 7784cc660580 Admin/Windows/launch4j/Isabelle.exe Binary file Admin/Windows/launch4j/Isabelle.exe has changed diff -r 5d4852f1b952 -r 7784cc660580 Admin/Windows/launch4j/isabelle.xml --- a/Admin/Windows/launch4j/isabelle.xml Fri Jan 11 08:17:47 2013 +0100 +++ b/Admin/Windows/launch4j/isabelle.xml Fri Jan 11 13:23:51 2013 +0100 @@ -24,7 +24,7 @@ jdkOnly - -Disabelle.home="%EXEDIR%" -Dcygwin.root="%EXEDIR%\\cygwin" + -Disabelle.home="%EXEDIR%" -Dcygwin.root="%EXEDIR%\\contrib\\cygwin" isabelle.bmp diff -r 5d4852f1b952 -r 7784cc660580 Admin/lib/Tools/makedist_bundles --- a/Admin/lib/Tools/makedist_bundles Fri Jan 11 08:17:47 2013 +0100 +++ b/Admin/lib/Tools/makedist_bundles Fri Jan 11 13:23:51 2013 +0100 @@ -117,8 +117,6 @@ perl -pi -e "s,lookAndFeel=.*,lookAndFeel=com.sun.java.swing.plaf.windows.WindowsLookAndFeel,g;" \ "$TMP/$ISABELLE_NAME/src/Tools/jEdit/dist/properties/jEdit.props" - mv "$ISABELLE_TARGET/contrib/cygwin" "$ISABELLE_TARGET" - cp "$ISABELLE_HOME/Admin/Windows/launch4j/Isabelle.exe" "$ISABELLE_TARGET/Isabelle2013.exe" cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" \ "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" "$ISABELLE_TARGET"