Changeset 37970

Timestamp:

2023-08-24T11:19:44+12:00 (10 months ago)

Author:

davidb

Message:

Fixes after testing on a freshly setup Windows machine

Location:

main/trunk/greenstone3/ext-cli

Files:

• get-selfcontained-ant.bat (modified) (1 diff)
• get-selfcontained-jdk.bat (modified) (4 diffs)
• get-selfcontained-nodejs.bat (modified) (3 diffs)

main/trunk/greenstone3/ext-cli/get-selfcontained-ant.bat

@@ -8 +8 @@
 set installed_dir=%selfcon_ext%\apache-ant
 
+echo.
+cmd /c .\get-subversion-windows-64bit.bat
+cmd /c .\setup-subversion-windows-64bit.bat
+
+echo.
 
 if not exist selfcontained-jdk (

main/trunk/greenstone3/ext-cli/get-selfcontained-jdk.bat

@@ -9 +9 @@
 
 echo.
+cmd /c .\get-subversion-windows-64bit.bat
+cmd /c .\setup-subversion-windows-64bit.bat
+
+echo.
 if not exist %selfcon_ext% (
     echo Checking out from svn: Greenstone3\'s %selfcon_ext% extension
@@ -15 +19 @@
     if %ERRORLEVEL% NEQ 0 ( 
     echo Error encountered checking out:  1>&2
-    echo     svn co https://svn.greenstone.org/gs3-extensions/$selfcon_ext/trunk $selfcon_ext 1>&2
-    exit 1
+    echo     svn co https://svn.greenstone.org/gs3-extensions/%selfcon_ext%/trunk %selfcon_ext% 1>&2
+    exit /b 1
     )
 ) else (
@@ -31 +35 @@
     if %ERRORLEVEL% NEQ 0 (    
     echo Error encountered running: 1>&2
-    echo     cd $selfcon_ext && .\PREPARE-${OS_ALLCAPS}.bat 1>&2
-    exit 1
+    echo     cd %selfcon_ext% && .\PREPARE-%OS_ALLCAPS%.bat 1>&2
+    exit /b 1
     )
     
@@ -54 +58 @@
 echo.
 
+
+pause press enter to finish
+
 endlocal

main/trunk/greenstone3/ext-cli/get-selfcontained-nodejs.bat

@@ -9 +9 @@
 
 echo.
+cmd /c .\get-subversion-windows-64bit.bat
+cmd /c .\setup-subversion-windows-64bit.bat
+
+
+echo.
 if not exist %selfcon_ext% (
     echo Checking out from svn: Greenstone3\'s %selfcon_ext% extension
@@ -15 +20 @@
     if %ERRORLEVEL% NEQ 0 ( 
     echo Error encountered checking out:  1>&2
-    echo     svn co https://svn.greenstone.org/gs3-extensions/$selfcon_ext/trunk $selfcon_ext 1>&2
-    exit 1
+    echo     svn co https://svn.greenstone.org/gs3-extensions/%selfcon_ext%/trunk %selfcon_ext% 1>&2
+    exit /b 1
     )
 ) else (
@@ -31 +36 @@
     if %ERRORLEVEL% NEQ 0 (    
     echo Error encountered running: 1>&2
-    echo     cd $selfcon_ext && .\PREPARE-${OS_ALLCAPS}.bat 1>&2
-    exit 1
+    echo     cd %selfcon_ext% && .\PREPARE-%OS_ALLCAPS%.bat 1>&2
+    exit /b 1
     )