incremental progress towards unified build process

diff --git a/scripts/build_basic_database_workproducts.sh b/scripts/build_basic_database_workproducts.sh
index efb5ab6..d01c20d 100755 (executable)
--- a/scripts/build_basic_database_workproducts.sh
+++ b/scripts/build_basic_database_workproducts.sh
@@ -1,27 +1,39 @@
 #git fetch XTUPLE
 #git checkout XTUPLE/4_4_x
 
-
-#rm -rf scripts/output
-#npm run-script build-basic-postbooks-package-sql
+rm -rf scripts/output
+npm run-script build-basic-postbooks-package-sql
 #npm run-script build-basic-empty
 #npm run-script build-basic-postbooks-demo
 #npm run-script build-basic-quickstart
-#cd ../private-extensions
+cd ../private-extensions
 
 #git fetch XTUPLE
 #git checkout XTUPLE/4_4_x
 
-#npm run-script build-basic-manufacturing-package-sql
-#npm run-script build-basic-distribution-package-sql
+npm run-script build-basic-manufacturing-package-sql
 #npm run-script build-basic-manufacturing-empty
 #npm run-script build-basic-manufacturing-quickstart
+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/pb440to441
-cp scripts/xml/postbooks_package.xml scripts/output/pb440to441
-cp scripts/output/toolkit.sql scripts/output/pb440to441
-cp scripts/output/updates.sql scripts/output/pb440to441
-tar -zcvf scripts/output/pb440to441.gz scripts/output/pb440to441
+#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/

diff --git a/scripts/lib/build_database_util.js b/scripts/lib/build_database_util.js
index b1f96da..e9f9b81 100644 (file)
--- a/scripts/lib/build_database_util.js
+++ b/scripts/lib/build_database_util.js
@@ -297,7 +297,7 @@ regexp:true, undef:true, strict:true, trailing:true, white:true */
             scriptCallback("Error: " + fullFilename + " contents do not end in a semicolon.");
           }
 
-          scriptCallback(null, beforeNoticeSql + scriptContents);
+          scriptCallback(null, '\n' + scriptContents);
         });
       };
       async.mapSeries(databaseScripts || [], getScriptSql, function (err, scriptSql) {

diff --git a/scripts/xml/distribution_package.xml b/scripts/xml/distribution_package.xml
new file mode 100644 (file)
index 0000000..fc102c2
--- /dev/null
+++ b/scripts/xml/distribution_package.xml
@@ -0,0 +1,23 @@
+<package id        = "dist441"
+         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 PostBooks 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+ Distribution database.
+    </message>
+  </prerequisite>
+
+  <script file="updates.sql" />
+  <script file="inventory_upgrade.sql" />
+
+</package>

diff --git a/scripts/xml/xtmfg_package.xml b/scripts/xml/xtmfg_package.xml
new file mode 100644 (file)
index 0000000..40bece6
--- /dev/null
+++ b/scripts/xml/xtmfg_package.xml
@@ -0,0 +1,22 @@
+<package id        = "xtmfg441"
+         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 PostBooks 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="updates.sql" />
+  <script file="manufacturing_upgrade.sql" />
+</package>