Changeset 36831

Timestamp:

2022-10-18T09:43:47+13:00 (19 months ago)

Author:

kjdon

Message:

updated rke-setup for new greenstone windows build system

File:

• other-projects/expeditee-release-kits/trunk/rke-setup.bat.in (modified) (4 diffs)

other-projects/expeditee-release-kits/trunk/rke-setup.bat.in

@@ -1 +1 @@
 @echo off
 
-:: Example setup file for generating the installer
-::   => Copy this to setup.bat, and then edit values below to
+:: Environment setup file for generating the expeditee installer
+::   => Copy this to rke-setup.bat, and then edit values below to
 ::      be meaninful for you own computer setup
 
@@ -17 +17 @@
 set os=windows
 set products_suffix=-%os%
-set uploads_suffix=-%products_suffix%
+set uploads_suffix=%products_suffix%
 set out_suffix=-%os%
-:: identity_file is the public key file
-set identity_file=%currentdir%\tools\keys\upload-expeditee.ppk
+:: identity_file is the ppk file
+set identity_file=%CD%\keys\upload-expeditee-ed25519.ppk
 
 :: Set Visual Studio environment here by calling vcvars. MS SDK not needed for Expeditee
-::call "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.cmd"
-call "C:\Program Files\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat"
-echo   Called vcvars 32 bit
+set vslocation=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build
+if not exist "%vslocation%" echo %vslocation% does not exist& goto end
+pushd "%vslocation%"
+:: host 64bit, target 32 bit
+call vcvarsamd64_x86
+:: call vcvars32 - if on old 32 bit machine
+popd
 
-set JAVA_HOME=C:\Program Files\Java\jdk1.8.0
+echo   Called vcvarsamd64_x86
+
+set JAVA_HOME=C:\Program Files\RedHat\java-1.8.0-openjdk-1.8.0.265-3
 if not exist "%JAVA_HOME%\" (
     echo ***** JAVA_HOME %JAVA_HOME% does not exist. Set this in %0
@@ -33 +39 @@
 )
 set PATH=%JAVA_HOME%\bin;%PATH%
-echo   Adding in JDK 1.8.1
+echo   Adding in JDK 1.8
 
-set ANT_HOME=C:\cygwin2013\home\davidb\research\packages\ant-1.9.2
+set ANT_HOME=C:\greenstone\gs-release-builder\packages\apache-ant-1.9.5
 if not exist "%ANT_HOME%\" (
     echo ***** ANT_HOME %ANT_HOME% does not exist. Set this in %0
@@ -43 +49 @@
 echo   Adding in Ant 1.9
 
-set "SVN_HOME=C:\Program Files\SlikSvn"
-if not exist "%SVN_HOME%\" (
-    echo ***** Can't find SVN in %SVN_HOME%. Set SVN path in %0
-    exit /B 1
-)
-set PATH=%SVN_HOME%\bin;%PATH%
-echo   Adding in Slik SVN 1.8.5
+rem - do we need to setup svn here?? assume its already on path
+rem set "SVN_HOME=C:\Program Files (x86)\Subversion"
+rem if not exist "%SVN_HOME%\" (
+rem echo ***** Can't find SVN in %SVN_HOME%. Set SVN path in %0
+rem exit /B 1
+rem )
+rem set PATH=%SVN_HOME%\bin;%PATH%
+rem echo   Adding in SVN
+
+set PATH=%CD%\shared\windows\utils;%PATH%
+echo   Adding RKE shared\windows\utils into PATH
 
 set PATH=%CD%\bin;%PATH%
 echo   Adding RKE scripts into PATH
 echo *===
+
+echo PATH=%PATH%
 
 echo.