Changeset 722 for packaging

Timestamp:

Apr 30, 2010, 10:19:14 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging: Improved QtEnv.cmd:

• Avoid double slashes.
• Add X:\OS2\DLL to LIBRARY_PATH.
• Make sure MAKESHELL is CMD.EXE.
• Run the non-.cmd executable specified on the command line directly bypassing CMD.EXE

File:

• packaging/QtEnv.cmd (modified) (6 diffs)

packaging/QtEnv.cmd

@@ -1 +1 @@
 /*
- * Script to set up the environment for the Qt4 development package
+ * Script to set up the environment for the Qt4 Development package
+ */
+
+/*
+ * You do not normally need to change anything in this script
+ *------------------------------------------------------------------------------
  */
 
 '@echo off'
 trace off
+
 
 parse arg aArgs
@@ -16 +22 @@
     say
     say 'Qt4 Environment is already set up.'
-    say
     exit 0
 end
+
+
 
 etc = value('ETC',, 'OS2ENVIRONMENT')
@@ -24 +31 @@
 if (etc == '') then etc = SysBootDrive()
 
+
+
+
+
+
+
+
+
+
+
 look = 0
 G.Prefix = ''
 G.Binaries = ''
-qt_conf = etc"\qtsys.conf"
 do while lines(qt_conf)
     v = linein(qt_conf)
@@ -47 +63 @@
 curdir = directory()
 
-basedir = stream(qt_conf, 'C', 'QUERY EXISTS')
-if (basedir \== '') then
-    basedir = filespec('D', basedir)||filespec('P',basedir)
-else do
-    say 'ERROR: Cannot find "'qt_conf'". Proabaly, the Qt4 development package is not installed.'
-    exit 1
-end
-
 call directory basedir
 if (G.Prefix \== '') then
@@ -60 +68 @@
 else
     G.Prefix = basedir
+
 
 if (G.Binaries \== '') then
@@ -65 +74 @@
 else
     G.Binaries = G.Prefix'\bin'
+
 
-say
-say 'Qt4 base directory is     : "'G.Prefix'"'
-say 'Qt4 binary directory is   : "'G.Binaries'"'
-say
+call directory curdir
+
+/* Set up the environment */
+
+'set QT_BASE='G.Prefix
+'set QT_BIN='G.Binaries
 
 'set PATH='G.Binaries';%PATH%'
 'set BEGINLIBPATH='G.Binaries';%BEGINLIBPATH%'
+
+
+
+
+
+
+
+
+
 'set QTENV_CMD_DONE=1'
 
-say 'Qt4 Environment is set up.'
-say
+if (aArgs \== '') then do
+    /* Start the program */
+    prg = translate(word(aArgs, 1))
+    isCmd = 0
+    realPrg = SysSearchPath(PATH, prg)
+    if (realPrg == '') then realPrg = SysSearchPath(PATH, prg'.EXE')
+    if (realPrg == '') then realPrg = SysSearchPath(PATH, prg'.COM')
+    if (realPrg == '') then realPrg = SysSearchPath(PATH, prg'.CMD')
+    if (realPrg \== '') then do
+        if (right(realPrg, 4) == '.CMD') then isCmd = 1
+    end
+    if (isCmd) then 'call' aArgs
+    else aArgs
+end
+else do
+    /* Print some information about the environment */
+    say
+    say 'Qt4 base directory (QT_BASE)  : 'G.Prefix
+    say 'Qt4 binary directory (QT_BIN) : 'G.Binaries
+    say
+    say 'Qt4 Environment is set up. If you use the qmake tool, it already knows'
+    say 'where to look for Qt parts. If you use your own makefiles, you may use the'
+    say 'environment variables shown in parenthesis above to refer to the corresponding'
+    say 'locations.'
+    say
+    say 'Please note that this script does *not* set up the compiler environment!'
+    say 'You should do it yourself in order to be able to compile Qt programs.'
+end
 
-call directory curdir
+exit
 
-if (aArgs \= '') then
-    '%COMSPEC% /c' aArgs
+FixDir: procedure
+    parse arg aDir
+    if (right(aDir, 1) == '\') then
+        aDir = left(aDir, length(aDir) - 1)
+    return aDir
 
-exit 0
+OnError:
+        exit