Commit 987c4e43 authored by John van Groningen's avatar John van Groningen
Browse files

update BatchBuild after some changes to the CleanIDE

parent b63391dc
......@@ -2,7 +2,7 @@ definition module PmCleanSystem
from StdFile import ::Files
from UtilStrictLists import ::List
from PmTypes import ::CodeGenOptions,::Processor,::ApplicationOptions,::LinkMethod
from PmTypes import ::CodeGenOptions,::Processor,::ApplicationOptions,::LinkMethod,::ModuleDirAndName
from PmCompilerOptions import ::CompilerOptions,::ListTypes
import StdOverloaded
......@@ -32,18 +32,18 @@ standardStaticLibraries :: !Processor !LinkMethod -> List String
standardObjectFiles :: !Bool !Bool !Processor !Bool -> List String
getLibs :: ![String] !*Files -> (!(![String],![String]),!*Files)
CompileHandleExitCode :: !Int !String !String !Int !(WindowFun *env) !(WindowFun *env) !Pathname
CompileHandleExitCode :: !Int !String !String !Int !(WindowFun *env) !(WindowFun *env) !ModuleDirAndName
!ListTypes !*env -> (!Pathname,!CompilerMsg,!*env) | FileEnv env
InitCompilingInfo :: *CompilingInfo
Compile :: !String !Bool !Bool !(WindowFun *env) !(WindowFun *env) !CompileOrCheckSyntax !Pathname
Compile :: !String !Bool !Bool !(WindowFun *env) !(WindowFun *env) !CompileOrCheckSyntax !ModuleDirAndName !Pathname
!(List Pathname) !Bool !Bool !Bool !CompilerOptions !Pathname !CompilerProcessIds !*env
-> (!Pathname,!CompilerMsg,!CompilerProcessIds,!*env)
| FileEnv env
CompilePersistent ::
!String !Bool !(WindowFun *env) !(WindowFun *env) !CompileOrCheckSyntax !Pathname
!String !Bool !(WindowFun *env) !(WindowFun *env) !CompileOrCheckSyntax !ModuleDirAndName
!(List Pathname) !Bool !Bool !Bool !CompilerOptions !Pathname !*CompilingInfo !*env
-> (!*CompilingInfo,!(!*env, !Pathname, !CompilerMsg))
| FileEnv env
......@@ -58,7 +58,7 @@ ExitCleanCompiler :: !*(!*CompilingInfo,*env) -> *(!*CompilingInfo,*env)
QuitCleanCompiler :: !Bool !CompilerProcessIds !*World -> *World
CodeGen :: !String !Bool !(WindowFun *GeneralSt) !CodeGenerateAsmOrCode !Pathname !Bool
CodeGen :: !String !Bool !(WindowFun *GeneralSt) !CodeGenerateAsmOrCode !Pathname !Pathname !Bool
!CodeGenOptions !Processor !ApplicationOptions !Pathname !CompilerProcessIds !*GeneralSt
-> (!Pathname,!Bool,!CompilerProcessIds,!*GeneralSt)
......
......@@ -5,9 +5,9 @@ from Directory import pd_StringToPath,getFileInfo,createDirectory,::Path,::FileI
import UtilStrictLists
from Platform import DirSeparatorString
import StdPathname
from PmTypes import ::CodeGenOptions(..),::Processor,::ApplicationOptions(..),::Output(..),::LinkMethod
import PmTypes
from PmCompilerOptions import ::CompilerOptions(..),::ListTypes(..),instance == ListTypes
from PmPath import MakeABCSystemPathname,MakeObjSystemPathname
import PmPath
import PmCallBack
from PmParse import IsTypeSpec,IsImportError20
......@@ -66,12 +66,12 @@ getLibs libs files = abort "getLibs"
InitCompilingInfo :: *CompilingInfo
InitCompilingInfo = NoCompiler
Compile :: !String !Bool !Bool !(WindowFun *env) !(WindowFun *env) !CompileOrCheckSyntax !Pathname
Compile :: !String !Bool !Bool !(WindowFun *env) !(WindowFun *env) !CompileOrCheckSyntax !ModuleDirAndName !Pathname
!(List Pathname) !Bool !Bool !Bool !CompilerOptions !Pathname !CompilerProcessIds !*env
-> (!Pathname,!CompilerMsg,!CompilerProcessIds,!*env)
| FileEnv env
Compile
cocl use_compiler_process_ids write_module_times errwin typewin compileOrCheckSyntax path paths projectHeapProfiling
cocl use_compiler_process_ids write_module_times errwin typewin compileOrCheckSyntax mdn path paths projectHeapProfiling
projectTimeProfiling projectEagerOrDynamic co=:{CompilerOptions | listTypes}
startupdir compiler_process_ids env
# (cocl,cocl_dir,options1,options2) = get_path_name_and_options2 cocl startupdir
......@@ -107,15 +107,15 @@ Compile
# exitcode = if (result==0) 0 1
# dummy_slot = 0
# (path,mess,env) = CompileHandleExitCode exitcode cocl startupdir dummy_slot errwin typewin path listTypes env
# (path,mess,env) = CompileHandleExitCode exitcode cocl startupdir dummy_slot errwin typewin mdn listTypes env
= (path,mess,compiler_process_ids,env)
CompilePersistent ::
!String !Bool !(WindowFun *env) !(WindowFun *env) !CompileOrCheckSyntax !Pathname
!String !Bool !(WindowFun *env) !(WindowFun *env) !CompileOrCheckSyntax !ModuleDirAndName
!(List Pathname) !Bool !Bool !Bool !CompilerOptions !Pathname !*CompilingInfo !*env
-> (!*CompilingInfo,!(!*env, !Pathname, !CompilerMsg))
| FileEnv env
CompilePersistent cocl write_module_times errwin typewin compileOrCheckSyntax path paths projectHeapProfiling
CompilePersistent cocl write_module_times errwin typewin compileOrCheckSyntax mdn paths projectHeapProfiling
projectTimeProfiling projectEagerOrDynamic co=:{CompilerOptions | listTypes}
startupdir compiling_info env
# (cocl,cocl_dir,options1,options2) = get_path_name_and_options2 cocl startupdir
......@@ -128,7 +128,7 @@ CompilePersistent cocl write_module_times errwin typewin compileOrCheckSyntax pa
# args = makeCompilerOptionsArguments compileOrCheckSyntax write_module_times projectHeapProfiling projectTimeProfiling projectEagerOrDynamic co
# args_string = concat_args args+++
" "+++path+++
" "+++mdn.mdn_name+++
" -P "+++"\""+++concatenate_paths paths+++"\""+++
" -RE "+++"\""+++errors_file_name+++"\""+++
" -RO "+++"\""+++out_file_name+++"\""
......@@ -148,7 +148,7 @@ CompilePersistent cocl write_module_times errwin typewin compileOrCheckSyntax pa
# exitcode = parse_result_number 0 result_string
# dummy_slot = 0
# (path,mess,env) = CompileHandleExitCode exitcode cocl startupdir dummy_slot errwin typewin path listTypes env
# (path,mess,env) = CompileHandleExitCode exitcode cocl startupdir dummy_slot errwin typewin mdn listTypes env
= (compiling_info,(env,path,mess))
parse_result_number i result_string
......@@ -243,14 +243,13 @@ QuitCleanCompiler async compiler_process_ids world
exit_compilers [] world
= world
CodeGen :: !String !Bool !(WindowFun *GeneralSt) !CodeGenerateAsmOrCode !Pathname !Bool
CodeGen :: !String !Bool !(WindowFun *GeneralSt) !CodeGenerateAsmOrCode !Pathname !Pathname !Bool
!CodeGenOptions !Processor !ApplicationOptions !Pathname !CompilerProcessIds !*GeneralSt
-> (!Pathname,!Bool,!CompilerProcessIds,!*GeneralSt)
CodeGen cgen used_compiler_process_ids wf genAsmOrCode path timeprofile cgo tp ao startupdir compiler_process_ids ps
CodeGen cgen used_compiler_process_ids wf genAsmOrCode abc_path obj_path timeprofile cgo tp ao startupdir compiler_process_ids ps
# (cgen,cgendir,options) = get_path_name_and_options cgen startupdir
# path_without_suffix = RemoveSuffix path
# path_without_suffix = RemoveSuffix abc_path
# cg_arguments = make_code_generator_arguments genAsmOrCode cgo
# obj_path = MakeObjSystemPathname tp path
# temp_dir = temp_dir_path startupdir
errors_file_name = errors_file_path temp_dir 0
......@@ -291,7 +290,7 @@ CodeGen cgen used_compiler_process_ids wf genAsmOrCode path timeprofile cgo tp a
ps = if errors_not_empty
(wf (StrictListToList error_text) ps)
(if (exit_code <> 0)
(wf ["Error: Code generator failed for '"+++path+++"' with exit code: "+++toString exit_code,(quoted_string path_without_suffix)] ps)
(wf ["Error: Code generator failed for '"+++abc_path+++"' with exit code: "+++toString exit_code,(quoted_string path_without_suffix)] ps)
ps
)
| exit_code<>0
......@@ -333,11 +332,10 @@ CodeGen cgen used_compiler_process_ids wf genAsmOrCode path timeprofile cgo tp a
start_code_generator :: !String !(WindowFun *GeneralSt) !Pathname !Int !Bool !CodeGenOptions !Processor !Pathname !*GeneralSt
-> (!Bool,!Int/*HANDLE*/,!StartedCodeGenerator,!*GeneralSt)
start_code_generator cgen wf path slot timeprofile cgo tp startupdir ps
start_code_generator cgen wf abc_path slot timeprofile cgo tp startupdir ps
# (cgen,cgendir,options) = get_path_name_and_options cgen startupdir
# path_without_suffix = RemoveSuffix path
# path_without_suffix = RemoveSuffix abc_path
# cg_arguments = make_code_generator_arguments CodeGeneration cgo
# obj_path = MakeObjSystemPathname tp path
# temp_dir = temp_dir_path startupdir
errors_file_name = errors_file_path temp_dir slot
......@@ -359,7 +357,7 @@ start_code_generator cgen wf path slot timeprofile cgo tp startupdir ps
= abort "execution continued after execv"
| free args_memory<0
= abort "free failed"
# scg = {scg_abc_path=path,scg_path_without_suffix=path_without_suffix,
# scg = {scg_abc_path=abc_path,scg_path_without_suffix=path_without_suffix,
scg_std_error_fd=stderr_fd,scg_errors_file_name=errors_file_name}
= (True,code_generator_pid,scg,ps)
......@@ -561,9 +559,9 @@ start_a_compiler_if_not_yet_started compiler_file_name slot compiler_process_ids
# compiler_process_ids = compiler_process_ids++[compiler_process]
= (compiler_process,compiler_process_ids)
CompileHandleExitCode :: !Int !String !String !Int !(WindowFun *env) !(WindowFun *env) !Pathname
CompileHandleExitCode :: !Int !String !String !Int !(WindowFun *env) !(WindowFun *env) !ModuleDirAndName
!ListTypes !*env -> (!Pathname,!CompilerMsg,!*env) | FileEnv env
CompileHandleExitCode exitcode cocl startupdir slot errwin typewin path listTypes ps
CompileHandleExitCode exitcode cocl startupdir slot errwin typewin mdn listTypes ps
# temp_dir = temp_dir_path startupdir
out_file_name = out_file_path temp_dir slot
errors_file_name = errors_file_path temp_dir slot
......@@ -578,7 +576,7 @@ CompileHandleExitCode exitcode cocl startupdir slot errwin typewin path listType
: (case errors of CompilerOK -> ["Unable to open Errors file"] ; _ -> [])
] ps
)
# abcpath = MakeABCSystemPathname path
# abcpath = ModuleDirAndNameToABCSystemPathname mdn
ps = (if type_text_not_empty (typewin (StrictListToList type_text)) id) ps
ps = (if errors_and_messages_not_empty (errwin (StrictListToList errors_and_messages)) id) ps
errors = case exitcode of
......
Supports Markdown
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