script now creates all packages, un-tested on live database

diff --git a/scripts/build_basic_database_workproducts.sh b/scripts/build_basic_database_workproducts.sh
index d01c20d..23440fa 100755 (executable)
--- a/scripts/build_basic_database_workproducts.sh
+++ b/scripts/build_basic_database_workproducts.sh
@@ -18,22 +18,41 @@ npm run-script build-basic-distribution-package-sql
 #npm run-script build-basic-distribution-empty
 #npm run-script build-basic-distribution-quickstart
 
-#mkdir scripts/output/pb441
-#cp scripts/xml/postbooks_package.xml scripts/output/pb441/package.xml
-#cp scripts/output/toolkit.sql scripts/output/pb441
-#cp scripts/output/updates.sql scripts/output/pb441
-#cd scripts/output
-#tar -zcvf pb441.gz pb441/
-
-#mkdir scripts/output/dist441
-#cp scripts/xml/distribution_package.xml scripts/output/dist441/package.xml
-#cp scripts/output/updates.sql scripts/output/dist441
-#cp scripts/output/inventory_upgrade.sql scripts/output/dist441
-#cd scripts/output
-#tar -zcvf dist441.gz dist441/
-
-#mkdir scripts/output/xtmfg441
-#cp scripts/xml/xtmfg_package.xml scripts/output/xtmfg441/package.xml
-#cp scripts/output/manufacturing_upgrade.sql scripts/output/xtmfg441
-#cd scripts/output
-#tar -zcvf xtmfg441.gz xtmfg441/
+cd ../xtuple
+mkdir scripts/output/pb441
+cp scripts/xml/postbooks_package.xml scripts/output/pb441/package.xml
+cp scripts/output/toolkit.sql scripts/output/pb441
+cp scripts/output/updates.sql scripts/output/pb441
+cd scripts/output
+tar -zcvf pb441.gz pb441/
+
+cd ../../
+mkdir scripts/output/dist441
+cp scripts/xml/distribution_package.xml scripts/output/dist441/package.xml
+cp scripts/output/updates.sql scripts/output/dist441
+cp scripts/output/inventory_upgrade.sql scripts/output/dist441
+cd scripts/output
+tar -zcvf dist441.gz dist441/
+
+cd ../../
+mkdir scripts/output/pbtodist441
+cp scripts/xml/distribution_install.xml scripts/output/pbtodist441/package.xml
+cp scripts/output/inventory_basic_install.sql scripts/output/pbtodist441
+cp scripts/output/inventory_upgrade.sql scripts/output/pbtodist441
+cd scripts/output
+tar -zcvf 441pbtodist.gz pbtodist441/ 
+
+cd ../../
+mkdir scripts/output/xtmfg441
+cp scripts/xml/xtmfg_package.xml scripts/output/xtmfg441/package.xml
+cp scripts/output/manufacturing_upgrade.sql scripts/output/xtmfg441
+cd scripts/output
+tar -zcvf xtmfg_upgrade-441.gz xtmfg441/
+
+cd ../../
+mkdir scripts/output/xtmfg_install441
+cp scripts/xml/xtmfg_install.xml scripts/output/xtmfg_install441/package.xml
+cp scripts/output/manufacturing_basic_install.sql scripts/output/xtmfg_install441
+cp scripts/output/manufacturing_upgrade.sql scripts/output/xtmfg_install441
+cd scripts/output
+tar -zcvf xtmfg_install-441.gz xtmfg_install441/

diff --git a/scripts/xml/distribution_install.xml b/scripts/xml/distribution_install.xml
new file mode 100644 (file)
index 0000000..681d923
--- /dev/null
+++ b/scripts/xml/distribution_install.xml
@@ -0,0 +1,23 @@
+<package id        = "pbtodist441"
+         version   = "4.4.1"
+         developer = "xTuple"
+         descrip   = "load PostBooks resources"
+         updater   = "2.2.4" >
+
+  <prerequisite type = "query"
+                name = "Checking xTuple Edition" >
+    <query>SELECT fetchMetricText('Application') = 'Postbooks';</query>
+    <message>This package must be applied to a Distribution database.</message>
+  </prerequisite>
+
+  <prerequisite type = "query"
+                name = "Checking xTuple ERP database version" >
+    <query>SELECT fetchMetricText('ServerVersion') ~ '^4.4.';</query>
+    <message>This package must be applied to a 4.4+ Postbooks database.
+    </message>
+  </prerequisite>
+
+  <script file="inventory_basic_install.sql" />
+  <script file="inventory_upgrade.sql" />
+
+</package>

diff --git a/scripts/xml/distribution_package.xml b/scripts/xml/distribution_package.xml
index fc102c2..cb6c585 100644 (file)
--- a/scripts/xml/distribution_package.xml
+++ b/scripts/xml/distribution_package.xml
@@ -7,7 +7,7 @@
   <prerequisite type = "query"
                 name = "Checking xTuple Edition" >
     <query>SELECT fetchMetricText('Application') = 'Standard';</query>
-    <message>This package must be applied to a PostBooks database.</message>
+    <message>This package must be applied to a Distribution database.</message>
   </prerequisite>
 
   <prerequisite type = "query"

diff --git a/scripts/xml/postbooks_package.xml b/scripts/xml/postbooks_package.xml
index 49af122..a2c711b 100644 (file)
--- a/scripts/xml/postbooks_package.xml
+++ b/scripts/xml/postbooks_package.xml
@@ -1,4 +1,4 @@
-<package id        = "dbscripts"
+<package id        = "pb441"
          version   = "4.4.1"
          developer = "xTuple"
          descrip   = "load PostBooks resources"
@@ -12,13 +12,11 @@
 
   <prerequisite type = "query"
                 name = "Checking xTuple ERP database version" >
-    <query>SELECT fetchMetricText('ServerVersion') = '.4.1.x-4.2.0'
-               OR fetchMetricText('ServerVersion') ~ '^4.1.';</query>
-    <message>This package must be applied to a 4.1.X PostBooks database.
+    <query>SELECT fetchMetricText('ServerVersion') ~ '^4.4.';</query>
+    <message>This package must be applied to a 4.4+ PostBooks database.
     </message>
   </prerequisite>
 
-  <script file="toolkit.sql" />
   <script file="updates.sql" />
 
 </package>

diff --git a/scripts/xml/xtmfg_install.xml b/scripts/xml/xtmfg_install.xml
new file mode 100644 (file)
index 0000000..61187ee
--- /dev/null
+++ b/scripts/xml/xtmfg_install.xml
@@ -0,0 +1,23 @@
+<package id        = "xtmfg_install441"
+         version   = "4.4.1"
+         developer = "xTuple"
+         descrip   = "load PostBooks resources"
+         updater   = "2.2.4" >
+
+  <prerequisite type = "query"
+                name = "Checking xTuple Edition" >
+    <query>SELECT fetchMetricText('Application') = 'Standard';</query>
+    <message>This package must be applied to a Distribution Edition database.</message>
+  </prerequisite>
+
+  <prerequisite type = "query"
+                name = "Checking xTuple ERP database version" >
+    <query>SELECT fetchMetricText('ServerVersion') ~ '^4.4.';</query>
+    <message>This package must be applied to a 4.4+ Manufacturing database.
+    </message>
+  </prerequisite>
+
+  <script file="manufacturing_basic_install.sql" />
+  <script file="manufacturing_upgrade.sql" />
+
+</package>

diff --git a/scripts/xml/xtmfg_package.xml b/scripts/xml/xtmfg_package.xml
index 40bece6..f12fb0e 100644 (file)
--- a/scripts/xml/xtmfg_package.xml
+++ b/scripts/xml/xtmfg_package.xml
@@ -7,7 +7,13 @@
   <prerequisite type = "query"
                 name = "Checking xTuple Edition" >
     <query>SELECT fetchMetricText('Application') = 'Standard';</query>
-    <message>This package must be applied to a PostBooks database.</message>
+    <message>This package must be applied to a Distribution Edition database.</message>
+  </prerequisite>
+
+  <prerequisite type="query" 
+               name ="Checking xtmfg package" >
+    <query>SELECT TRUE FROM pkghead WHERE pkghead_name = 'xtmfg';</query>
+    <message>This package must be applied to an xTuple ERP database that already contains the xtmfg package.</message>
   </prerequisite>
 
   <prerequisite type = "query"
@@ -19,4 +25,5 @@
 
   <script file="updates.sql" />
   <script file="manufacturing_upgrade.sql" />
+
 </package>