Changeset 35624

Timestamp:

2021-10-16T14:36:03+13:00 (3 years ago)

Author:

davidb

Message:

Updated versions, having been tested working in conjunction with the Release Kit code

Location:

local/greenstone3/windows-32bit

Files:

• README.txt (modified) (1 diff)
• gs3-devel.bat (modified) (1 diff)
• gs3-setup.bat (modified) (1 diff)

local/greenstone3/windows-32bit/README.txt

@@ -1 @@
-
+#----
+# Supporting command-line tools to compile up Greenstone3 as 32-bit binaries
+# (32-bit binaries will run on a 64-bit Windows OS, but will need a 32-bit JDK installed)
 
 
 # JDK8 32-bit
 
-  wget https://cdn.azul.com/zulu/bin/zulu8.56.0.21-ca-jdk8.0.302-win_i686.zip
   unzip zulu8.56.0.21-ca-jdk8.0.302-win_i686.zip
-  mv zulu8.56.0.21-ca-jdk8.0.302-win_i686 zulu-jdk8
+  mv zulu8.56.0.21-ca-jdk8.0.302-win_i686 zulu-jdk8-32bit
 
-# Strawberry Perl 32-bit
+# Perl5 -- This zip does not provide a top-level folder, so use '-d' on uzip
+
+  unzip -d strawberry-perl5-32bit strawberry-perl-5.18.4.1-32bit-portable.zip
+  
+# Ant              -- This is already unzipped and checked in
+
+# VisualStudio     -- This is assumed to be installed in your System area
+
+# Subversion (svn) -- This is assumed to already be on our PATH
+
+
+# Running gs3-devel.bat sets PATH and other relevant environment variables
+# appropriately
+
+.\gs3-devel.bat
+cd ..
+
+# Then compile Greenstone3 in the ususal way
+
+  ant
+  ant prepare
+  ant install
+  # ...
+
+#----
+
+
+####
+# Notes on where resources came from ...
+####
+
+##
+# JDK8 32-bit
+##
+
+# The JDK zip file came from Azul
+
+  firefox "https://www.azul.com/downloads/
+
+# => download zip
+
+# At time of writing, that was:
+
+  wget "https://cdn.azul.com/zulu/bin/zulu8.56.0.21-ca-jdk8.0.302-win_i686.zip"
+
+
+##
+# Perl
+##
+
+# The Perl zip file came from Strawberry Perl
 
   wget https://strawberryperl.com/download/5.18.4.1/strawberry-perl-5.18.4.1-32bit-portable.zip
 
-# ** Doesn't come with Top-level folder => use 7Zip or Right-click Windows unzip, and rename:
-  mv strawberry-perl-5.18.4.1-32bit-portable strawberry-perl5
-
-# ** OR
-  unzip -d strawberry-perl5 strawberry-perl-5.18.4.1-32bit-portable.zip
-
-
-
-
-====
-## 64-bit (UNUSED)
-
-
-
-##https://www.azul.com/downloads/?version=java-11-lts&os=windows&architecture=x86-64-bit&package=jdk
-##https://cdn.azul.com/zulu/bin/zulu11.50.19-ca-jdk11.0.12-win_x64.zip
-
-##unzip zulu11.50.19-ca-jdk11.0.12-win_x64.zip
-##mv zulu11.50.19-ca-jdk11.0.12-win_x64 zulu-jdk11
-
-# JDK8
-#unzip zulu8.56.0.21-ca-jdk8.0.302-win_x64.zip
-#mv zulu8.56.0.21-ca-jdk8.0.302-win_x64 zulu-jdk8
-
-
-
-## wget https://strawberryperl.com/download/5.18.4.1/strawberry-perl-5.18.4.1-64bit-portable.zip
-## mv strawberry-perl-5.18.4.1-64bit-portable strawberry-perl5
-

local/greenstone3/windows-32bit/gs3-devel.bat

@@ -1 +1 @@
 @echo off
 
-::rem pushd "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC"
-::pushd "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC"
-::call vcvarsall.bat amd64
-::popd
+::::
+:: Visual Studio
+::::
 
-::/cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat
-
+:: The Start-Menu way to get a VisualStudio terminal open is:
+::
+::   %comspec% /k "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
+::
+:: where cwd is:
+::   "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\"
+::
+:: To work within an existing terminal window, use 'call' instead:
+::
 pushd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\"
-:: ::%comspec% /k "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
-::call "VC\Auxiliary\Build\vcvars64.bat"
 call "VC\Auxiliary\Build\vcvars32.bat"
 popd
 
+echo Environment for Visual Studio 32-bit Compiler setup
 
-echo Environment for Visual Studio set up
+::::
+:: Ant (run as a developer)
+::::
 
-rem For ant prepare to work, now need wget (along with wgetrc file) on PATH
-rem These are just the GS3 wget
-echo "Adding wget with its wgetrc to PATH for devel"
+:: For 'ant prepare' to work, now need wget (along with wgetrc file) on PATH
+:: In 'local/bin' folder there is an appropriate binary for this (actually
+:: an external SVN reference to Greenstone's winbin support tools area)
+
+echo Adding wget with its wgetrc to PATH for devel
 pushd bin
 set PATH=%CD%;%PATH%

local/greenstone3/windows-32bit/gs3-setup.bat

@@ -2 +2 @@
 
 ::set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_45
-::set JAVA_HOME=C:\PROGRA~1\Java\JDK18~1.0_4
-::set JAVA_HOME=C:\Program Files\Java\jdk1.7.0_55
-::set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_20
-set JAVA_HOME=%CD%\zulu-jdk8
-::set JAVA_HOME=%CD%\zulu-jdk11
+set JAVA_HOME=%CD%\zulu-jdk8-32bit
+::set JAVA_HOME=%CD%\zulu-jdk11-32bit
+
 if not exist "%JAVA_HOME%" (
-echo %JAVA_HOME% not found. Exiting...
-goto done
+   echo %JAVA_HOME% not found. Exiting...
+   goto done
 )
 set PATH=%JAVA_HOME%\bin;%PATH%
+echo + Set JAVA_HOME=%JAVA_HOME% and updated PATH
 
-echo + Set JAVA_HOME=%JAVA_HOME% and updated PATH
-::set PERL_HOME=C:\strawberry-perl32no64\perl
-set PERL_HOME=%CD%\strawberry-perl5\perl
+
+::set PERL_HOME=C:\strawberry-perl-32bit\perl
+set PERL_HOME=%CD%\strawberry-perl5-32bit\perl
+set PATH=%PERL_HOME%\bin;%PATH%
+echo + Set PERL_HOME=%PERL_HOME% and updated PATH
+
 
 ::set ANT_HOME=%CD%\ant-1.8.3
 set ANT_HOME=%CD%\apache-ant-1.9.5
-
-set PATH=%PERL_HOME%\bin;%ANT_HOME%\bin;%PATH%
-
+set PATH=%ANT_HOME%\bin;%PATH%
 echo + Set ANT_HOME=%ANT_HOME% and updated PATH
-
-echo + Set PERL_HOME=%PERL_HOME% and updated PATH
-
-:: Already done in gs3-devel.bat
-rem pushd "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC"
-:: pushd "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC"
-::call vcvarsall.bat"" amd64
-rem call vcvarsall.bat amd64
-rem popd
-
-