cleanup

.patch

@@ -1,11 +1,8 @@
-# Version 5.1 Patch file
+# Version 5.2 Patch file
 #
-#
-patch=4
-# Updated customer xref maintenance panel to allow lookup by sku, upc
-#patch=3
-# Fixed issue with shipper maintenance panel.   The total fields were too low in the parent panel to be seen.  Adjusted the height of
-# the panel.
-# Also adjusted bszip.ps1 to maintain a running account of patches.   All lines in the patch file will be commented out except the
+# bszip.ps1 maintains a running account of patches.   All lines in the patch file will be commented out except the
 # current patch.   There can only be one line starting with 'patch=' in the .patch file rolling forward.
 # Once a new patch is added with comments...the previous patch= is commented out
+#
+patch=0
+# First release of 5.2

scripts/.patch52

@@ -0,0 +1,8 @@
+# Version 5.2 Patch file
+#
+# bszip.ps1 maintains a running account of patches.   All lines in the patch file will be commented out except the
+# current patch.   There can only be one line starting with 'patch=' in the .patch file rolling forward.
+# Once a new patch is added with comments...the previous patch= is commented out
+#
+patch=0
+# First release of 5.2

scripts/.patchsqlv52

@@ -0,0 +1 @@
+/* patches for v5.1 */

scripts/bszip.ps1

@@ -1,7 +1,16 @@
+param(
+[string] $version
+)
+
+if (-not($version)) { throw "You must supply a version:  51, 52, etc" }
+
+
 $wip = "c:\bs\wip"
+$patchvar = ".patch" + $version
+$patchsqlvar = ".patchsqlv" + $version
 
 # get latest patch number
-$filecontent = get-content .patch
+$filecontent = get-content $patchvar
 foreach ($line in $filecontent) {
      if ($line.startsWith("patch=")) {
      $e = $line -split '='
@@ -12,12 +21,12 @@ foreach ($line in $filecontent) {
 
 
 rm blueseer.patch.*.zip
-$patchdir = "patchV51P" + $pc
-$patchzip = "blueseer.patch.ver.51." + $pc + ".zip"
+$patchdir = "patchV" + $version + "P" + $pc
+$patchzip = "blueseer.patch.ver." + $version + "." + $pc + ".zip"
 mkdir $patchdir
-cp .patch $patchdir\
-cp .patch ..\
-cp .patchsqlv51 $patchdir\
+cp $patchvar $patchdir\.patch
+cp $patchvar ..\.patch
+cp $patchsqlvar $patchdir\
 cp patch_install.bat $patchdir\
 cp patch_install.sh $patchdir\
 cp ..\sf\patches\patch_instructions.pdf $patchdir\
@@ -28,14 +37,15 @@ cp ..\sf\zebra $patchdir\ -recurse
 compress-archive -force -path $patchdir -destinationpath $wip\$patchzip
 rmdir $patchdir -force -recurse
 
-rm $wip\blueseer.mysql.win.v51.zip
-compress-archive -path ..\sf\zebra -destinationpath $wip\blueseer.mysql.win.v51.zip
-compress-archive -update -path ..\sf\patches,..\sf\temp,..\sf\jasper,..\sf\data,..\sf\edi,..\sf\images -destinationpath $wip\blueseer.mysql.win.v51.zip
-compress-archive -update -path ..\dist -destinationpath $wip\blueseer.mysql.win.v51.zip
-compress-archive -update -path mysql_install.bat -destinationpath $wip\blueseer.mysql.win.v51.zip
-compress-archive -update -path login.bat -destinationpath $wip\blueseer.mysql.win.v51.zip
-compress-archive -update -path bslogging.properties -destinationpath $wip\blueseer.mysql.win.v51.zip
-compress-archive -update -path .patch -destinationpath $wip\blueseer.mysql.win.v51.zip
-compress-archive -update -path ..\jre11 -destinationpath $wip\blueseer.mysql.win.v51.zip
+$myzip = "blueseer.mysql.win.v" + $version + ".zip"
+rm $wip\$myzip
+compress-archive -path ..\sf\zebra -destinationpath $wip\$myzip
+compress-archive -update -path ..\sf\patches,..\sf\temp,..\sf\jasper,..\sf\data,..\sf\edi,..\sf\images -destinationpath $wip\$myzip
+compress-archive -update -path ..\dist -destinationpath $wip\$myzip
+compress-archive -update -path mysql_install.bat -destinationpath $wip\$myzip
+compress-archive -update -path login.bat -destinationpath $wip\$myzip
+compress-archive -update -path bslogging.properties -destinationpath $wip\$myzip
+compress-archive -update -path ..\.patch -destinationpath $wip\$myzip
+compress-archive -update -path ..\jre11 -destinationpath $wip\$myzip
 
 

scripts/installJRE32.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "BlueSeer"
-#define MyAppVersion "5.1"
+#define MyAppVersion "5.2"
 #define MyAppPublisher "VCSCode"
 #define MyAppURL "http://www.blueseer.com/"
 #define MyAppExeName "javaw"
@@ -23,7 +23,7 @@ AppUpdatesURL={#MyAppURL}
 UsePreviousAppDir=no
 DefaultDirName={sd}\{#MyAppName}
 DisableProgramGroupPage=yes
-OutputBaseFilename=blueseer.sqlite.win.v51
+OutputBaseFilename=blueseer.sqlite.win.v52
 Compression=lzma
 SolidCompression=yes
 PrivilegesRequired=poweruser
@@ -39,7 +39,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 [Files]
 Source: "C:\bs\blueseer\scripts\login.bat"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\bs\blueseer\scripts\bslogging.properties"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\bs\blueseer\scripts\.patch"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\bs\blueseer\.patch"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\bs\blueseer\scripts\bsconfig.sqlite"; DestDir: "{app}"; DestName: "{#bsconfig}"; Flags: ignoreversion
 Source: "C:\bs\bsmf\documentation\documentation.pdf"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\bs\blueseer\sf\data\*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs createallsubdirs