Changeset 36830 for other-projects

Timestamp:

2022-10-18T09:35:06+13:00 (19 months ago)

Author:

kjdon

Message:

create-expeditee.bat updated to work on new greenstone windows build machine, uploading results to www-internal.

File:

• other-projects/expeditee-release-kits/trunk/create-expeditee.bat (modified) (2 diffs)

other-projects/expeditee-release-kits/trunk/create-expeditee.bat

@@ -7 +7 @@
 
 
-:: currentdir (C:\Research\Nightly)
-set currentdir=%CD%
+:: installdir (C:\expeditee\expeditee-release-kits)
+set installdir=%CD%
 
 :: Need to edit rke-setup.bat and fill it in with local env vars values
-if not exist %currentdir%\tools\expeditee-release-kits\rke-setup.bat (
+if not exist %installdir%\rke-setup.bat (
 echo. 
 echo ******************* 
 echo. 
-echo First edit %currentdir%\tools\expeditee-release-kits\rke-setup.bat.in 
-echo to generate %currentdir%\tools\expeditee-release-kits\rke-setup.bat
+echo First generate %installdir%\rke-setup.bat by copying
+echo %installdir%\rke-setup.bat.in and editing it for your environment
 echo. 
 echo ******************* 
@@ -23 +23 @@
 )
 
-:: rke-setup.bat uses local paths, so cd into expeditee-release-kits first
-:: then call rke-setup.bat to source the environment vars it sets
-pushd %currentdir%\tools\expeditee-release-kits
+:: call rke-setup.bat to set the environment vars expeditee RK needs
 call rke-setup.bat
 if ERRORLEVEL 1 (
-    echo error level 1 or more
-    popd    
+    echo error level 1 or more  
     exit /B 1
 )
-popd
 
 
 :: Make sure the expeditee folder and its rke-build.properties file exist
 :: Then run the 'rke' command from snapshots\expeditee
-pushd %currentdir%\snapshots
+pushd %installdir%\snapshots
 ::http://www.robvanderwoude.com/battech_ifexistfolder.php
 if exist expeditee\ echo Deleting snapshots\expeditee&& rmdir /s /q expeditee
 if not exist expeditee\ mkdir expeditee
-if not exist expeditee\rke-build.properties copy C:\Research\Nightly\tools\expeditee-release-kits\rke-build.properties.in expeditee\rke-build.properties
+if not exist expeditee\rke-build.properties copy %installdir%\rke-build.properties.in expeditee\rke-build.properties
 pushd expeditee
+echo About to call rke
 call rke
 
+
+echo rke done
+echo Getting uploads ready
 :: Uploading
 mkdir uploads
 copy products\Expeditee-1%products_suffix%.exe uploads\Expeditee-1-%mydate%%uploads_suffix%.exe
 copy rke.out uploads\rke-%mydate%%os_suffix%-windows.out
-set PATH=C:\Windows\System32\linuxtools;C:\Program Files (x86)\PuTTY2;%PATH%
-:: Works from the cmd line:
-:: cd uploads && tar.exe -c * | plink.exe -T -i "C:\Research\Nightly\tools\keys\upload-expeditee.ppk" [email protected]
 
-:: The following setcmd ends up partially running the cmd and uploading everything in snapshots\expeditee onto the remote machine
-rem set upload_cmd=cd uploads && tar -c * | plink -T -i "C:\Research\Nightly\tools\keys\upload-expeditee.ppk" [email protected]
-rem echo %upload_cmd%
-cd uploads && tar -c * | plink -T -i "%identity_file%" [email protected]
-
+:: For now, we are uploading to www-internal. authorised_keys at that end will untar into /greenstone/files/expeditee
+cd uploads && tar -c * | plink -T -i "%identity_file%" [email protected]
 :end
 
-cd %currentdir%
+cd %installdir%
 endlocal
 ::exit