--- a/STCCompilerInterface.st Wed Mar 27 15:24:09 2019 +0100
+++ b/STCCompilerInterface.st Thu Mar 28 16:20:20 2019 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 1989 by Claus Gittinger
COPYRIGHT (c) 2006 by eXept Software AG
@@ -522,12 +524,12 @@
|command ok errorOutputFile|
- command := (self possiblyQuotedPath:stcPath) , ' ' , stcFlags
- , ' -defdir=', (self possiblyQuotedPath:cFileName asFilename directory pathName).
+ command := (Filename possiblyQuotedPathname:stcPath) , ' ' , stcFlags
+ , ' -defdir=', (Filename possiblyQuotedPathname:cFileName asFilename directory pathName).
cFileName asFilename suffix ~= 'c' ifTrue:[
command := command , ' -cSuffix=',cFileName asFilename suffix.
].
- command := command , ' -C ' , (self possiblyQuotedPath:stFileName asFilename pathName).
+ command := command , ' -C ' , (Filename possiblyQuotedPathname:stFileName asFilename pathName).
Verbose == true ifTrue:[
Transcript show:'executing: '; showCR:command.
@@ -575,6 +577,7 @@
"Created: / 07-11-2006 / 12:11:24 / cg"
"Modified: / 08-08-2011 / 22:12:01 / cg"
"Modified: / 16-05-2018 / 13:49:01 / stefan"
+ "Modified: / 28-03-2019 / 16:17:03 / Claus Gittinger"
!
compileToExe_onError:aBlock
@@ -583,7 +586,7 @@
|command errorOutputFile ok|
- command := (self possiblyQuotedPath:ccPath) , ' ' , cFlags , ' -D__INCREMENTAL_COMPILE__ ' , (self possiblyQuotedPath:cFileName).
+ command := (Filename possiblyQuotedPathname:ccPath) , ' ' , cFlags , ' -D__INCREMENTAL_COMPILE__ ' , (Filename possiblyQuotedPathname:cFileName).
Verbose == true ifTrue:[
Transcript show:'executing: ' showCR:command.
@@ -612,6 +615,8 @@
errorOutputFile remove.
].
^ ok
+
+ "Modified: / 28-03-2019 / 16:17:06 / Claus Gittinger"
!
compileToObj_onError:aBlock
@@ -634,11 +639,11 @@
commandTemplate := '%1 %2%3 -D__INCREMENTAL_COMPILE__ -o %4 -c %5'.
].
command := commandTemplate
- bindWith:(self possiblyQuotedPath:ccPath)
+ bindWith:(Filename possiblyQuotedPathname:ccPath)
with:cFlags
with:ccDefine
- with:(self possiblyQuotedPath:oFileName)
- with:(self possiblyQuotedPath:cFileName).
+ with:(Filename possiblyQuotedPathname:oFileName)
+ with:(Filename possiblyQuotedPathname:cFileName).
Verbose == true ifTrue:[
Transcript show:'executing: '; showCR:command.
@@ -688,6 +693,7 @@
^ ok
"Created: / 07-11-2006 / 12:14:51 / cg"
+ "Modified: / 28-03-2019 / 16:17:10 / Claus Gittinger"
!
compileToS_onError:aBlock
@@ -696,7 +702,7 @@
|command errorOutputFile ok|
- command := (self possiblyQuotedPath:ccPath) , ' ' , cFlags , ' -D__INCREMENTAL_COMPILE__ -S ' , (self possiblyQuotedPath:cFileName).
+ command := (Filename possiblyQuotedPathname:ccPath) , ' ' , cFlags , ' -D__INCREMENTAL_COMPILE__ -S ' , (Filename possiblyQuotedPathname:cFileName).
Verbose == true ifTrue:[
Transcript show:'executing: '; showCR:command.
@@ -724,6 +730,8 @@
errorOutputFile remove.
].
^ ok
+
+ "Modified: / 28-03-2019 / 16:17:13 / Claus Gittinger"
!
ensureExternalToolsArePresent
@@ -925,15 +933,6 @@
"Modified (format): / 08-08-2018 / 08:58:35 / Claus Gittinger"
!
-possiblyQuotedPath:aPath
- (aPath includes:Character space) ifTrue:[
- (aPath startsWith:$") ifFalse:[
- ^ '"',aPath,'"'
- ]
- ].
- ^ aPath
-!
-
reportCompilationErrorFor:aCommand
<resource: #obsolete>
self obsoleteMethodWarning.