Module packages now stored in their own folder

Author: Chris Maunder

devops/build/create_packages.bat

@@ -37,9 +37,8 @@ set dotNetTarget=net8.0
 
 :: Basic locations
 
-:: The name of the dir, within the current directory, where install assets will
-:: be downloaded
-set downloadDir=downloads
+:: The name of the dir, within the root directory, where packages will be stored
+set packageDir=\downloads\modules\packages
 
 :: The name of the dir holding the source code
 set srcDir=src
@@ -102,7 +101,11 @@ set utilsScript=!utilsScriptsDirPath!\utils.bat
 :: The location of directories relative to the root of the solution directory
 set modulesDirPath=!rootDirPath!\!modulesDir!
 set externalModulesDirPath=!rootDirPath!\..\!externalModulesDir!
-set downloadDirPath=!rootDirPath!\!downloadDir!
+set packageDirPath=!rootDirPath!\!packageDir!
+
+if [ ! -d "${packageDirPath}" ]; then mkdir -p "${packageDirPath}"; fi
+if not exist "!packageDirPath!" mkdir "!packageDirPath!"
+
 
 :: Let's go
 if /i "!useColor!" == "true" call "!utilsScript!" setESC
@@ -241,8 +244,8 @@ REM Creates a package for a module
 
                     rem Move package into modules download cache
 
-                    rem echo Moving !packageModuleDirPath!\!packageModuleId!-!version!.zip to !downloadDirPath!\!modulesDir!\
-                    move /Y !packageModuleDirPath!\!packageModuleId!-!packageVersion!.zip !downloadDirPath!\!modulesDir!\  >NUL
+                    rem echo Moving !packageModuleDirPath!\!packageModuleId!-!version!.zip to !packageDirPath!\
+                    move /Y !packageModuleDirPath!\!packageModuleId!-!packageVersion!.zip !packageDirPath!\  >NUL
 
                     if errorlevel 1 (
                         call "!utilsScript!" WriteLine "Error" "Red"

devops/build/create_packages.sh

@@ -35,9 +35,8 @@ dotNetTarget="net8.0"
 
 # Basic locations
 
-# The name of the dir, within the current directory, where install assets will
-# be downloaded
-downloadDir='downloads'
+# The name of the dir, within the root directory, where packages will be stored
+packageDir='downloads/modules/packages'
 
 # The name of the source directory (in development)
 srcDirName='src'
@@ -167,8 +166,8 @@ function doModulePackage () {
             popd >/dev/null
 
             # Move package into modules download cache       
-            # echo Moving ${packageModuleDirPath}/${packageModuleId}-${packageVersion}.zip to ${downloadDirPath}/${modulesDir}/
-            mv -f ${packageModuleDirPath}/${packageModuleId}-${packageVersion}.zip ${downloadDirPath}/${modulesDir}/  >/dev/null
+            # echo Moving ${packageModuleDirPath}/${packageModuleId}-${packageVersion}.zip to ${packageDirPath}/
+            mv -f ${packageModuleDirPath}/${packageModuleId}-${packageVersion}.zip ${packageDirPath}/  >/dev/null
 
             if [ $? -ne 0 ]; then
                 writeLine "Error" "Red"
@@ -185,7 +184,9 @@ function doModulePackage () {
 # The location of directories relative to the root of the solution directory
 modulesDirPath="${rootDirPath}//${modulesDir}"
 externalModulesDirPath="${rootDirPath}/../${externalModulesDir}"
-downloadDirPath="${rootDirPath}/${downloadDir}"
+packageDirPath="${rootDirPath}/${packageDir}"
+
+if [ ! -d "${packageDirPath}" ]; then mkdir -p "${packageDirPath}"; fi
 
 # Let's go