Changeset 721

Timestamp:

Apr 30, 2010, 10:12:02 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging: Added -B -D and -W command line options to make_packages.cmd.

File:

• packaging/make_packages.cmd (modified) (7 diffs)

packaging/make_packages.cmd

@@ -41 +41 @@
 G.Continue      = 0
 G.SkipConfigure = 0
+G.SkipBuild     = 0
+G.SkipBuildDocs = 0
 G.SkipInstall   = 0
+G.SkipWPI       = 0
 G.QtBuildDate   = ''
 
@@ -232 +235 @@
     end
 
+    /* build Qt */
+
+    call SaySay 'Building Qt in "'G.QtBuildDir'"...'
+
+    if (\G.SkipBuild) then do
+        if (Exec('make', G.QtBuildDir, '>'G.LogFile) \= 0) then
+            call Done 1
+    end
+    else
+        call SayWrn '...skipped'
+
+    /* build Qt docs */
+
+    call SaySay 'Building Qt documentation in "'G.QtBuildDir'"...'
+
+    if (\G.SkipBuildDocs) then do
+        if (Exec('make docs', G.QtBuildDir, '>'G.LogFile) \= 0) then
+            call Done 1
+    end
+    else
+        call SayWrn '...skipped'
+
     /* fake-install Qt to gather everything for distribution */
 
@@ -245 +270 @@
         call SayWrn '...skipped'
 
-    /* make install actually recreates the full directory tree in INSTALL_ROOT,
+    /* make install recreates the full directory tree in INSTALL_ROOT,
      * get the real install root that points directly to the installed Qt tree */
     G.QtInstDir = G.QtInstDir||filespec('P', G.QtBuildDir)||filespec('N', G.QtBuildDir)
 
     call SaySay 'Adjusted install directory to "'G.QtInstDir'"'
-
-    /* generate the proper qt.conf for the distribution */
 
     /* Set up common environment */
@@ -268 +291 @@
     call SetEnv 'ZIP_ROOT', G.OutDirZip
 
-    /* Do the rest */
-
-    call CreateAllWPI
+    /* Create WPI archives */
+
+    call SaySay 'Creating WPI archives in "'G.OutDirWpi'"...'
+    if (\G.SkipWPI) then do
+        call CreateAllWPI
+    end
+    else
+        call SayWrn '...skipped'
 
     call SaySay G.ScriptFile": END"
@@ -371 +399 @@
                 when (o == 'c') then G.Continue = 1
                 when (o == 'C') then G.SkipConfigure = 1
+                when (o == 'B') then G.SkipBuild = 1
+                when (o == 'D') then G.SkipBuildDocs = 1
                 when (o == 'I') then G.SkipInstall = 1
+                when (o == 'W') then G.SkipWPI = 1
                 when (o == '-date-override') then do
                     i = i + 1
@@ -402 +433 @@
     drop G.opts.0
 
-    if (G.QtBuildDir == '' | G.QtBuildRev == '' | G.QtBuildName == '' |,
-        G.OutDir == '') then
+    if (G.QtBuildDir == '' | G.QtBuildRev == '' | G.OutDir == '') then
         call Usage
 
@@ -436 +466 @@
     say
     say '  -c            : Continue a failed packaging process'
-    say '  -C            : Skip configuring the Qt build'
-    say '  -I            : Skip fake-installing the Qt build'
+    say '  -C            : Skip the configure stage'
+    say '  -B            : Skip the build stage'
+    say '  -D            : Skip the build documentation stage'
+    say '  -I            : Skip the fake-install stage'
+    say '  -W            : Skip creation of the WPI archives'
 
     call Done 0