Changeset 4361 for trunk/tools

Timestamp:

Oct 2, 2000, 6:08:49 AM (25 years ago)

Author:

bird

Message:

Generates relative projects.
Changes directory to the same directory as the project file during project
loading.

Location:

trunk/tools/vslick

Files:

• genproject.cmd (modified) (7 diffs)
• odin32.e (modified) (7 diffs)

trunk/tools/vslick/genproject.cmd

@@ -1 @@
-/* $Id: genproject.cmd,v 1.3 2000-05-19 21:22:49 bird Exp $
+/* $Id: genproject.cmd,v 1.4 2000-10-02 04:08:49 bird Exp $
  *
  * This script generates a Visual Slick project of the source and include
@@ -87 +87 @@
     if (stream(sProjFile, 'c', 'open write' ) <> '') then do
         call lineout sProjFile, '[COMPILER]'
-        call lineout sProjFile, 'MACRO=odin32_maketagfile();\n odin32_setcurrentdir();\n'
+        call lineout sProjFile, 'MACRO=odin32_setcurrentdir();\nodin32_maketagfile();\n'
         call lineout sProjFile, 'FILTEREXPANSION=1 1 0 0 1'
         call lineout sProjFile, 'compile=concur|capture|clear|:Compile:&Compile,nmake %n.obj'
@@ -104 +104 @@
 
         call lineout sProjFile, '[FILES]'
-        call processDirTree sProjFile, directory();
+        call processDirTree sProjFile, directory(), directory();
         call lineout sProjFile, '[ASSOCIATION]'
         call lineout sProjFile, '[STATE]'
@@ -136 +136 @@
 /* processes an directory tree */
 processDirTree: procedure
-    parse arg sProjFile, sDirectory
+    parse arg sProjFile, sDirectory, sRoot
 
     rc = SysFileTree(sDirectory'\*', sFiles, 'FO');
@@ -142 +142 @@
         do i = 1 to sFiles.0
             if filterFile(sFiles.i) then
-                call lineout sProjFile, sFiles.i
+                call lineout sProjFile, substr(sFiles.i, length(sRoot)+2)
         end
     end
@@ -150 +150 @@
         do i = 1 to sDirs.0
             if filterDirectory(sDirs.i) then
-                call processDirTree sProjFile, sDirs.i
+                call processDirTree sProjFile, sDirs.i, sRoot
         end
     end
@@ -163 +163 @@
 
     if lastpos('\', sFile) < lastpos('.', sFile) then do
-        sIncludeExt = 'c;cpp;h;hpp;inc;asm;rc;mak;cmd;mk;def;txt;'
+        sIncludeExt = 'c;cpp;h;hpp;inc;asm;rc;mak;cmd;mk;def;txt;orc;dlg;doc;ipf;'
         sExt = substr(sFile, lastpos('.', sFile)+1);
 

trunk/tools/vslick/odin32.e

@@ -1 @@
-/* $Id: odin32.e,v 1.5 2000-07-21 14:56:24 bird Exp $
+/* $Id: odin32.e,v 1.6 2000-10-02 04:08:49 bird Exp $
  *
  * Visual SlickEdit Documentation Macros.
@@ -49 +49 @@
 
 /* Remeber to change these! */
-_str sOdin32UserInitials = "kso";
-_str sOdin32UserName     = "knut st. osmundsen";
-_str sOdin32UserEmail    = "knut.stange.osmundsen@pmsc.no";
+static _str sOdin32UserInitials = "kso";
+static _str sOdin32UserName     = "knut st. osmundsen";
+static _str sOdin32UserEmail    = "knut.stange.osmundsen@mynd.no";
 
 
@@ -202 +202 @@
         _insert_text(";;\n");
         _insert_text("; \n");
-        _insert_text("; @cproto    \n");
-        _insert_text("; @returns   \n");
-        _insert_text("; @param     \n");
-        _insert_text("; @uses      \n");
-        _insert_text("; @equiv     \n");
-        _insert_text("; @time      \n");
-        _insert_text("; @sketch    \n");
-        _insert_text("; @status    \n");
-        _insert_text("; @author    "sOdin32UserName" (" sOdin32UserEmail ")\n");
-        _insert_text("; @remark    \n");
+        _insert_text("; @cproto   \n");
+        _insert_text("; @returns  \n");
+        _insert_text("; @param    \n");
+        _insert_text("; @uses     \n");
+        _insert_text("; @equiv    \n");
+        _insert_text("; @time     \n");
+        _insert_text("; @sketch   \n");
+        _insert_text("; @status   \n");
+        _insert_text("; @author   "sOdin32UserName" (" sOdin32UserEmail ")\n");
+        _insert_text("; @remark   \n");
         up(11);
         p_col = 3;
@@ -219 +219 @@
         _insert_text("/**\n");
         _insert_text(" * \n");
-        _insert_text(" * @returns   \n");
-        _insert_text(" * @param     \n");
-        _insert_text(" * @equiv     \n");
-        _insert_text(" * @time      \n");
-        _insert_text(" * @sketch    \n");
-        _insert_text(" * @status    \n");
-        _insert_text(" * @author    "sOdin32UserName" (" sOdin32UserEmail ")\n");
-        _insert_text(" * @remark    \n");
+        _insert_text(" * @returns \n");
+        _insert_text(" * @param   \n");
+        _insert_text(" * @equiv   \n");
+        _insert_text(" * @time    \n");
+        _insert_text(" * @sketch  \n");
+        _insert_text(" * @status  \n");
+        _insert_text(" * @author  "sOdin32UserName" (" sOdin32UserEmail ")\n");
+        _insert_text(" * @remark  \n");
         _insert_text(" */\n");
         up(10);
         p_col = 4;
     }
-
 }
 
@@ -304 +303 @@
     if (file_eq(p_extension, 'asm'))
     {
-        _insert_text("; $Id: odin32.e,v 1.5 2000-07-21 14:56:24 bird Exp $\n");
+        _insert_text("; $Id: odin32.e,v 1.6 2000-10-02 04:08:49 bird Exp $\n");
         _insert_text("; \n");
         _insert_text("; \n");
@@ -317 +316 @@
     else
     {
-        _insert_text("/* $Id: odin32.e,v 1.5 2000-07-21 14:56:24 bird Exp $\n");
+        _insert_text("/* $Id: odin32.e,v 1.6 2000-10-02 04:08:49 bird Exp $\n");
         _insert_text(" * \n");
         _insert_text(" * \n");
@@ -334 +333 @@
 _command void odin32_maketagfile()
 {
+    /* We'll */
     if (file_match('-p 'maybe_quote_filename(strip_filename(_project_name,'e'):+TAG_FILE_EXT),1)=="")
         _project_update_files_retag(true,false,false,true);
+    else
+        _project_update_files_retag(false,false,false,false);
 }
 
 _command void odin32_setcurrentdir()
 {
-    _ini_get_value(_project_name,"COMPILER","WORKINGDIR", workingdir);
-    cd(workingdir);
-}
+    //_ini_get_value(_project_name,"COMPILER","WORKINGDIR", workingdir);
+    //cd(workingdir);
+    /* Go the the directory containing the project filename */
+    cd(strip_filename(_project_name, 'NE'));
+}
+