Changeset 1885

Timestamp:

Oct 20, 2015, 5:36:39 AM (10 years ago)

Author:

John Small

Message:

Ticket #574: Support multiple levels of destination directories

File:

• trunk/warpin/bld_fm2_wpidirs.cmd (modified) (5 diffs)

trunk/warpin/bld_fm2_wpidirs.cmd

@@ -5 +5 @@
  * FM/2 Warpin archive (WPI file).
  *
+ * Change log:
+ *    19 Oct 15 JBS Ticket #574: Support multiple levels of destination directories
+ *
  * TODO:
- *    -  Support multiple levels of destination directories
  *    -  Add logic to read script to determine
  *       -  Number of packages
@@ -40 +42 @@
 
 do f = 1 to WPI.fileline.0
-   parse var WPI.fileline.f . filename pkgnum src_subdir dest_subdir
+   parse var WPI.fileline.f . filename pkgnum src_subdir dest_subdir .
    if WPI.src_basedir \= '..\' then  /* Ignore src_subdir from file if not using build subtree */
       src_subdir = '.'
    dest_basedir   = MakePackageDir( pkgnum )
-   dest_dir = dest_basedir || '\' || strip(dest_subdir)
-   call SysMkDir dest_dir
-   'copy ' || WPI.src_basedir || src_subdir || '\' || filename || ' ' || dest_dir
+   if dest_subdir \= '.' then
+      call MkDir dest_basedir, dest_subdir
+   'copy' WPI.src_basedir || src_subdir || '\' || filename || ' ' || dest_basedir || '\' || dest_subdir
 end
 
@@ -53 +55 @@
 
 ErrorExit:
+   WPI.retval = 1
    parse arg errorcode
    select
@@ -68 +71 @@
             say '   'sourceline(sigl)
             signal NormalExit
+         end
+      when errorcode = 6 then
+         do
+            say 'Error: Unable to create package staging subdirectory.'
          end
       otherwise
@@ -157 +164 @@
 return full_dirname
 
+/* Creates a directory, including any non-existant parents */
+MkDir: procedure expose (globals)
+   parse arg basedir, subdirs
+   curdir = directory()
+   do while subdirs \= ''
+      parse var subdirs subdir '\' subdirs
+      if subdir \= '.' then
+         do
+            dir = basedir || '\' || subdir
+            if translate(dir) \= translate(right(directory(dir), length(dir))) then
+               do
+                  rcx = SysMkDir(dir)
+                  if rcx \= 0 then
+                     call ErrorExit 6
+               end
+            call directory curdir
+            basedir = dir
+         end
+   end
+return
+