Changeset 413 for trunk/Components

Timestamp:

Feb 22, 2019, 1:44:06 AM (6 years ago)

Author:

ataylor

Message:

Revamp of build system, and added ConfigApps to repository.

Location:

trunk

Files:

• . (modified) (1 prop)
• Components/Components.res (deleted)
• Components/Components.spr (deleted)
• Components/Components.spr.def (added)
• Components/StringUtilsUnit.pas (added)
• Components/makeall.cmd (modified) (2 diffs)

trunk/Components/makeall.cmd

@@ -1 @@
-/* Rexx */
-
 /* ------------------------------------------------------------------------- */
 /* NewView - a new OS/2 Help Viewer                                          */
 /*                                                                           */
 /* Copyright 2003-2006 Aaron Lawrence (aaronl at consultant dot com)         */
-/* Copyright 2006 Ronald Brill (rbri at rbri.org)                            */
+/* Copyright 2006-2017 Ronald Brill (rbri at rbri.org)                       */
 /*                                                                           */
 /* This software is released under the Gnu Public License                    */
@@ -14 +12 @@
 /* 3.) Compile                                                               */
 /* ------------------------------------------------------------------------- */
+Signal On NoValue
+Signal On Error
+Call RxFuncAdd 'SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs'
+Call SysLoadFuncs
+
+Call SetLocal
+nv_rc = SetUpPaths()
+If nv_rc <> 0 Then Exit rc
+
+nv_build_dir = Value('NV_BUILD',,'OS2ENVIRONMENT')
+nv_rc = SysMkDir( nv_build_dir )
 
 
-nv_i18n_dir = directory()
-
-nv_build_dir = value('NV_BUILD', , 'OS2ENVIRONMENT')
-nv_rc = SysMkDir(nv_build_dir)
+/* Project-specific section follows */
 
 nv_build_dir_components = nv_build_dir||'\components'
-nv_rc = SysMkDir(nv_build_dir_components)
+nv_rc = SysMkDir( nv_build_dir_components )
 
-/* TODO dir cleanup */
-
-
-say 'Building Aaron''s Components...'
-
-
+Say 'Building Aaron''s Components...'
 'rcomp20 ControlsUtility.rc ' nv_build_dir_components
 'rcomp20 DialogIcons.rc ' nv_build_dir_components
 'rcomp20 FileImages.rc ' nv_build_dir_components
-
 'spc20 components.spr'
 
+Call EndLocal
+Exit 0
+
+
+/* -------------------------------------------------------------------------- *
+ * SetUpPaths                                                                 *
+ * -------------------------------------------------------------------------- */
+SetUpPaths: PROCEDURE EXPOSE g.
+    g.!env_inc = Stream('..\env.inc', 'C', 'QUERY EXISTS')
+    g.!watcom = GetVar('WATCOM')
+    If g.!watcom == '' Then Do
+        Say '%WATCOM% environment variable is not set.'
+        Say 'Please set %WATCOM% to the location of your OpenWatcom installation.'
+        Return 1
+    End
+    g.!nv_dev = GetVar('NV_DEV')
+    If g.!nv_dev == '' Then Do
+        Say '%NV_DEV% environment variable is not set.'
+        Say 'Please set %NV_DEV% to the top-level path of the development tree.'
+        Return 1
+    End
+    '@SET NV_BUILD='g.!nv_dev'\build'
+    '@SET PATH=%WATCOM%\BINP;%WATCOM%\BINW;%NV_BUILD%\newview;%NV_BUILD%\newview_stub;%PATH%'
+    '@SET INCLUDE=%WATCOM%\H;%WATCOM%\H\OS2;' || GetVar('PMPRINTF_PATH')
+    '@SET LIB=%PMPRINTF_PATH%;'
+    '@SET HELP=%WATCOM%\BINP\HELP;%HELP%'
+    '@SET BOOKSHELF=%WATCOM%\BINP\HELP;%BOOKSHELF%'
+    '@SET BEGINLIBPATH=%WATCOM%\BINP\DLL;%BEGINLIBPATH%;'
+Return 0
+
+
+/* -------------------------------------------------------------------------- *
+ * GetVar                                                                     *
+ * -------------------------------------------------------------------------- */
+GetVar: Procedure Expose g.
+    Parse Upper Arg env_var
+    val = Value( env_var,, 'OS2ENVIRONMENT')
+    If val == '' Then Do
+        if g.!env_inc <> '' Then Do
+            match.0 = 0
+            mstring = 'SET' env_var'='
+            Call SysFileSearch mstring, g.!env_inc, 'match.'
+            If match.0 > 0 Then Do i = 1 to match.0
+                match.i = Translate( Strip( match.i ))
+                If Left( match.i, Length( mstring )) == mstring Then Do
+                    Parse Var match.i '='val
+                    Call Value env_var, val, 'OS2ENVIRONMENT'
+                    Leave
+                End
+            End
+        End
+    End
+Return val
+
+
+/* -------------------------------------------------------------------------- *
+ * Condition Handlers                                                         *
+ * -------------------------------------------------------------------------- */
+NoValue:
+    Say
+    Call Lineout 'STDERR:', Right( sigl, 6 ) '+++' STRIP( SOURCELINE( sigl ))
+    Call Lineout 'STDERR:', Right( sigl, 6 ) '+++ Non-initialized variable.'
+    Say
+Exit sigl
+
+Error:
+    Say
+    Call Lineout 'STDERR:', '+++ Error:' Condition('D')
+    Say
+Exit sigl
+
+