Commit c8a44c88 authored by John van Groningen's avatar John van Groningen
Browse files

use DirSeparator and DirSeparatorString from Platform instead of dirseparator from StdSystem

parent 734f6d30
implementation module PmDriver implementation module PmDriver
import StdArray, StdBool, StdList, StdMisc, StdEnum import StdArray, StdBool, StdList, StdMisc, StdEnum
import StdPSt, StdSystem, StdPStClass, StdTimer
import StdWindow
import UtilNewlinesFile, UtilIO import UtilNewlinesFile, UtilIO
...@@ -23,7 +21,7 @@ import PmAbcMagic ...@@ -23,7 +21,7 @@ import PmAbcMagic
import PmFileInfo import PmFileInfo
import PmDirCache import PmDirCache
import interrupt,Platform import Platform
from StdLibMisc import :: Date{..}, :: Time{..} from StdLibMisc import :: Date{..}, :: Time{..}
//from dodebug import trace_n` //from dodebug import trace_n`
...@@ -718,7 +716,7 @@ step intr (DLink ds=:{ok, newpaths, fileinfo, libsinfo, modpaths, abccache, proj ...@@ -718,7 +716,7 @@ step intr (DLink ds=:{ok, newpaths, fileinfo, libsinfo, modpaths, abccache, proj
# ({be_verbose},ps) = getPrefs ps # ({be_verbose},ps) = getPrefs ps
# ps = HandleDCErrors be_verbose errs warns ps # ps = HandleDCErrors be_verbose errs warns ps
# (ok,full_sys0,_,abcPathsCache) = DC_Search (MakeABCPathname System) abcPathsCache # (ok,full_sys0,_,abcPathsCache) = DC_Search (MakeABCPathname System) abcPathsCache
# full_sys = full_sys0 +++ {dirseparator} +++ (MakeABCPathname System) # full_sys = full_sys0 +++ DirSeparatorString +++ (MakeABCPathname System)
# full_sys` = MakeImpPathname full_sys # full_sys` = MakeImpPathname full_sys
# ao = PR_GetApplicationOptions project # ao = PR_GetApplicationOptions project
...@@ -749,7 +747,7 @@ step intr (DLink ds=:{ok, newpaths, fileinfo, libsinfo, modpaths, abccache, proj ...@@ -749,7 +747,7 @@ step intr (DLink ds=:{ok, newpaths, fileinfo, libsinfo, modpaths, abccache, proj
// if out of date regenerate // if out of date regenerate
= GenCodeTheProjectModule genabc True CodeGeneration abcpath abccache fileinfo project ps = GenCodeTheProjectModule genabc True CodeGeneration abcpath abccache fileinfo project ps
# (sys_date, ps) = accFiles (FModified full_sys) ps # (sys_date, ps) = accFiles (FModified full_sys) ps
# sys_obj = full_sys0 +++ {dirseparator} +++ (MakeObjPathname tp System) # sys_obj = full_sys0 +++ DirSeparatorString +++ (MakeObjPathname tp System)
# (sys_obj_date,ps) = accFiles (FModified sys_obj) ps # (sys_obj_date,ps) = accFiles (FModified sys_obj) ps
# sys_obj_date_time = DATEtoDateTime sys_obj_date # sys_obj_date_time = DATEtoDateTime sys_obj_date
# (abcPathsCache,ps) = case genabc of # (abcPathsCache,ps) = case genabc of
...@@ -1509,7 +1507,7 @@ where ...@@ -1509,7 +1507,7 @@ where
MakeOptionsName :: !.String !Processor -> String MakeOptionsName :: !.String !Processor -> String
MakeOptionsName path processor MakeOptionsName path processor
= path`+++{dirseparator}+++"Clean System Files"+++{dirseparator}+++"_"+++name+++MakeObjPathname processor "_options" = path`+++DirSeparatorString+++"Clean System Files"+++DirSeparatorString+++"_"+++name+++MakeObjPathname processor "_options"
where where
path` = RemoveFilename path path` = RemoveFilename path
name = RemoveSuffix` (RemovePath path) name = RemoveSuffix` (RemovePath path)
...@@ -1572,7 +1570,7 @@ GetPathNames :: !(List String) !(List String) !*DirCache -> (.Bool,List String,! ...@@ -1572,7 +1570,7 @@ GetPathNames :: !(List String) !(List String) !*DirCache -> (.Bool,List String,!
GetPathNames Nil acc cache = (True, acc, cache) GetPathNames Nil acc cache = (True, acc, cache)
GetPathNames (fn:!fns) acc cache GetPathNames (fn:!fns) acc cache
# (ok,pn,_,cache) = DC_Search fn cache # (ok,pn,_,cache) = DC_Search fn cache
| ok = GetPathNames fns (pn +++ {dirseparator} +++ fn :! acc) cache | ok = GetPathNames fns (pn +++ DirSeparatorString +++ fn :! acc) cache
= (False, (fn :! Nil), cache) = (False, (fn :! Nil), cache)
// Lookup Module Paths in Directory Cache // Lookup Module Paths in Directory Cache
......
implementation module PmCleanSystem implementation module PmCleanSystem
import StdArray, StdBool, StdChar, StdFunc, StdInt, StdList, StdEnum import StdArray, StdBool, StdChar, StdFunc, StdInt, StdList, StdEnum
import StdSystem, StdPStClass, StdMaybe import StdMaybe
from StdMisc import undef from StdMisc import undef
from Platform import DirSeparator,DirSeparatorString
import Directory import Directory
import PmCompilerOptions, UtilStrictLists import PmCompilerOptions, UtilStrictLists
...@@ -396,7 +398,7 @@ errors_file_path tooltempdir slot ...@@ -396,7 +398,7 @@ errors_file_path tooltempdir slot
file_path :: String String Int -> String file_path :: String String Int -> String
file_path dir base_name slot file_path dir base_name slot
= dir +++ toString dirseparator +++ base_name +++ (if (slot == 0) "" (toString slot)) = dir +++ DirSeparatorString +++ base_name +++ (if (slot == 0) "" (toString slot))
ConcatenatePath :: (List Pathname) -> String ConcatenatePath :: (List Pathname) -> String
/* old version /* old version
...@@ -568,7 +570,7 @@ CodeGen cgen` used_compiler_process_ids wf genAsmOrCode path timeprofile cgo tp ...@@ -568,7 +570,7 @@ CodeGen cgen` used_compiler_process_ids wf genAsmOrCode path timeprofile cgo tp
// +++ " " +++ (watcom_quoted_string path_without_suffix) // +++ " " +++ (watcom_quoted_string path_without_suffix)
+++ " " +++ (quoted_string path_without_suffix) +++ " " +++ (quoted_string path_without_suffix)
errorsfilename = tooltempdir +++ toString dirseparator +++ "errors" errorsfilename = tooltempdir +++ DirSeparatorString +++ "errors"
(didit,exit_code,_) = trace_n errorsfilename CallProcess command [] cgendir "" "" errorsfilename 99 (didit,exit_code,_) = trace_n errorsfilename CallProcess command [] cgendir "" "" errorsfilename 99
| not didit | not didit
= (objpath,False,compiler_process_ids,wf [ "Error: Unable to run code generator: "+++cgen = (objpath,False,compiler_process_ids,wf [ "Error: Unable to run code generator: "+++cgen
...@@ -648,7 +650,7 @@ Link linker` winfun path ...@@ -648,7 +650,7 @@ Link linker` winfun path
, stack_size = ss , stack_size = ss
, gen_dll = gen_dll , gen_dll = gen_dll
, dll_names = dll_syms , dll_names = dll_syms
, dynamics_path = startupdir +++. {dirseparator} +++. dynlstr , dynamics_path = startupdir +++. DirSeparatorString +++. dynlstr
} }
# linkerpath = RemoveFilename linker # linkerpath = RemoveFilename linker
// # linkoptspath = MakeFullPathname linkerpath "linkopts" // # linkoptspath = MakeFullPathname linkerpath "linkopts"
...@@ -676,9 +678,9 @@ Link linker` winfun path ...@@ -676,9 +678,9 @@ Link linker` winfun path
mangleLinker linkstr` startupdir mangleLinker linkstr` startupdir
# (linkstr`,opts) = splitOptions linkstr` # (linkstr`,opts) = splitOptions linkstr`
# (shortOK,linkstr) = GetShortPathName (startupdir +++ toString dirseparator +++ linkstr` +++ "\0") # (shortOK,linkstr) = GetShortPathName (startupdir +++ DirSeparatorString +++ linkstr` +++ "\0")
| not shortOK | not shortOK
# line = "Error: Unable to get short path name '" +++ (startupdir +++ toString dirseparator +++ linkstr`) +++ "'." # line = "Error: Unable to get short path name '" +++ (startupdir +++ DirSeparatorString +++ linkstr`) +++ "'."
= (False,line,"") = (False,line,"")
# linkcom = linkstr % (0, size linkstr - 2) +++ opts # linkcom = linkstr % (0, size linkstr - 2) +++ opts
# linkdir = RemoveFilename (linkstr % (0, size linkstr - 2)) # linkdir = RemoveFilename (linkstr % (0, size linkstr - 2))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment