Changeset 3304

Timestamp:

May 6, 2007, 2:19:22 AM (18 years ago)

Author:

bird

Message:

Use out/.../dist as UNIXROOT.

File:

• trunk/env.cmd (modified) (1 diff)

trunk/env.cmd

@@ -135 +135 @@
 
     /*
-     * Figure where the UNIXROOT is.
-     *
-     * The UNIXROOT is one or our parent directories, it is where all the 
-     * unix/gnu tools are installed. It is also where you will install
-     * the packages that we compiler. If not specified we will got hunting 
-     * for it...
+     * Figure where the output directory is.
+     * (kBuild actually decides this, so kee it in sync.)
+     */
+    sPathOut  = sPathRoot'\out\'sBuildTarget'.'sBuildArch'\'sBuildType
+    sPathOutF = sPathRootF'/out/'sBuildTarget'.'sBuildArch'/'sBuildType
+
+    /*
+     * Use out/.../dist as UNIXROOT if not specified or in the env.
      */
     if (sPathUnix = '') then
-    do
-        sPathUnix = ToDosSlash(sPathRoot);
-        do while (1)
-            say 'sPathUnix='sPathUnix
-            if (DirExists(sPathUnix'\usr\bin')) then 
-                leave;
-
-            /* next */
-            sTmp = filespec('drive', sPathUnix)||strip(filespec('path', sPathUnix), 'T', '\');
-            if (sTmp = sPathUnix) then
-            do
-                say 'error: cannot find a suitable unix root directory. Use the --unixroot <path> option.'
-                exit(12)
-            end
-            if (length(sTmp) == 2) then 
-                sTmp = sTmp||'\';
-            sPathUnix = sTmp;
-        end
-        say 'info: detected unix root at '''sPathUnix'''.';
-    end
+        sPathUnix = sPathOut'\dist';
+    say 'info: unix root at '''sPathUnix'''.';
     sPathUnix = ToDosSlash(FixPath(sPathUnix));
     sPathUnixF = ToUnixSlash(sPathUnix);
     sPathUnixFD= ToUnixSlash(filespec('path', sPathUnix)||filespec('name', sPathUnix));
-    if (ToLower(sPathUnixF) <> substr(ToLower(sPathRootF), 1, length(sPathUnixF))) then 
-        say 'warning: the source tree is not under the unix root.';
-
-    /*
-     * Figure where the output directory is.
-     * (kBuild actually decides this, so kee it in sync.)
-     */
-    sPathOut  = sPathRoot'\out\'sBuildTarget'.'sBuildArch'\'sBuildType
-    sPathOutF = sPathRootF'/out/'sBuildTarget'.'sBuildArch'/'sBuildType
 
     /*