Mercurial Mercurial > hg > stx-libbasic / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue #238: remove `\NUL` from diretory targets jv
authorPatrik Svestka <patrik.svestka@gmail.com>
Wed, 29 Aug 2018 14:15:11 +0200
branchjv
changeset 23324 1f8c02c6a747
parent 23292 6897bbc3f437
child 23404 197f5ade34ba
Issue #238: remove `\NUL` from diretory targets ...i.e., use: resources\%(MODULE): resources mkdir resources\%(MODULE) instead of: resources\%(MODULE)\NUL: resources\NUL mkdir resources\%(MODULE) THe `\NUL` technique was (needed?) on MSDOS and Windows 9x but does not work reliably on NT-kernel based Windows with NTFS [1]. Borland makefiles using '\NUL` proved to fail on Windows 10 Version 1703 (OS build 15063.1266) while it seem to work on various XPs, Windows 7 and Windows 10 Version 1803 (OS Build 17134.228). This commit fixed the issue. [1]: https://web.archive.org/web/20150609092521/https://support.microsoft.com/en-us/kb/65994 [2]: https://swing.fit.cvut.cz/projects/stx-jv/ticket/238
ApplicationDefinition.st file | annotate | diff | comparison | revisions
FolderForProjectsDefinition.st file | annotate | diff | comparison | revisions
LibraryDefinition.st file | annotate | diff | comparison | revisions 
--- a/ApplicationDefinition.st	Fri May 25 12:46:21 2018 +0200
+++ b/ApplicationDefinition.st	Wed Aug 29 14:15:11 2018 +0200
@@ -1893,7 +1893,7 @@
 %(PREREQUISITES_LIBS)      
 %(SUBPROJECTS_LINES)
 
-sources\NUL: 
+sources: 
         mkdir sources
 
 show:
@@ -2039,6 +2039,7 @@
     "Modified: / 03-03-2016 / 21:15:43 / cg"
     "Modified: / 19-01-2017 / 11:50:05 / stefan"
     "Modified: / 25-01-2017 / 20:03:01 / jv"
+    "Modified: / 29-08-2018 / 13:32:38 / svestkap"
 !
 
 bc_dot_mak_app_source_rules
@@ -2046,7 +2047,7 @@
 
     ^ String streamContents:[:s |
         s nextPutAll:'
-%(APPLICATION)_SOURCES: sources\%(MODULE)\%(MODULE_PATH)\NUL
+%(APPLICATION)_SOURCES: sources\%(MODULE)\%(MODULE_PATH)
         -copy ..\*.st sources\%(MODULE)\%(MODULE_PATH)\..\*.*
 
 '.
@@ -2058,14 +2059,14 @@
             part2 := (p copyTo:len) asStringWith:$\.
             part1 := (p copyTo:len-1) asStringWith:$\.
             s nextPutAll:'
-sources\%(MODULE)\',part2,'\NUL: sources\%(MODULE)\',part1,'\NUL
+sources\%(MODULE)\',part2,': sources\%(MODULE)\',part1,'
         mkdir sources\%(MODULE)\',part2,'
 '.
             s cr.
         ].
 
         s nextPutAll:'
-sources\%(MODULE)\',p first,'\NUL: sources\%(MODULE)\NUL
+sources\%(MODULE)\',p first,': sources\%(MODULE)
         mkdir sources\%(MODULE)\',p first,'
 '.
         s cr.
@@ -2073,13 +2074,14 @@
         "/ be careful to not include two rules for it (-> stx_source_rules).
         self module ~= 'stx' ifTrue:[
             s nextPutAll:
-'sources\%(MODULE)\NUL: sources\NUL
+'sources\%(MODULE): sources
         mkdir sources\%(MODULE)
 '.
         ].
     ]
 
     "Created: / 15-05-2007 / 17:27:37 / cg"
+    "Modified: / 29-08-2018 / 13:32:23 / svestkap"
 !
 
 bc_dot_mak_resource_rules
@@ -2087,15 +2089,15 @@
 
     ^ String streamContents:[:s |
         s nextPutAll:'
-%(APPLICATION)_RESOURCES: resources\%(MODULE)\%(MODULE_PATH)\NUL
+%(APPLICATION)_RESOURCES: resources\%(MODULE)\%(MODULE_PATH)
         -copy ..\resources\*.rs resources\%(MODULE)\%(MODULE_PATH)\..
         -copy ..\resources\*.style resources\%(MODULE)\%(MODULE_PATH)\..
 
-%(APPLICATION)_BITMAPS: resources\%(MODULE)\%(MODULE_PATH)\bitmaps\NUL
+%(APPLICATION)_BITMAPS: resources\%(MODULE)\%(MODULE_PATH)\bitmaps
         -copy *.ico resources\%(MODULE)\%(MODULE_PATH)\bitmaps
         -copy *.gif resources\%(MODULE)\%(MODULE_PATH)\bitmaps
 
-resources\%(MODULE)\%(MODULE_PATH)\bitmaps\NUL: resources\%(MODULE)\%(MODULE_PATH)\NUL
+resources\%(MODULE)\%(MODULE_PATH)\bitmaps: resources\%(MODULE)\%(MODULE_PATH)
         mkdir resources\%(MODULE)\%(MODULE_PATH)\bitmaps
 '.
 
@@ -2106,26 +2108,27 @@
             part2 := (p copyTo:len) asStringWith:$\.
             part1 := (p copyTo:len-1) asStringWith:$\.
             s nextPutAll:'
-resources\%(MODULE)\',part2,'\NUL: resources\%(MODULE)\',part1,'\NUL
+resources\%(MODULE)\',part2,': resources\%(MODULE)\',part1,'
         mkdir resources\%(MODULE)\',part2,'
 '.
         ].
 
         s nextPutAll:'
-resources\%(MODULE)\',p first,'\NUL: resources\%(MODULE)\NUL
+resources\%(MODULE)\',p first,': resources\%(MODULE)
         mkdir resources\%(MODULE)\',p first,'
 '.
 
         "/ be careful to not include two rules for it (-> stx_resource_rules).
         self module ~= 'stx' ifTrue:[
             s nextPutAll:
-'resources\%(MODULE)\NUL: resources\NUL
+'resources\%(MODULE): resources
         mkdir resources\%(MODULE)
 '.
         ].
     ]
 
     "Modified: / 09-02-2007 / 16:13:43 / cg"
+    "Modified: / 29-08-2018 / 13:31:41 / svestkap"
 !
 
 bc_dot_mak_stx_resource_rules
@@ -2137,7 +2140,7 @@
 stx_RESOURCES: \
         keyboard.rc \
         keyboardMacros.rc \
-        host.rc \        
+        host.rc \         
         display.rc \
         d_win32.rc \
         libbasic_RESOURCES \
@@ -2171,71 +2174,72 @@
 d_win32.rc: $(TOP)\projects\smalltalk\d_win32.rc
         copy $(TOP)\projects\smalltalk\d_win32.rc *.*
 
-stx_STYLES: resources\stx\libview\NUL resources\stx\libview\styles\NUL
+stx_STYLES: resources\stx\libview  resources\stx\libview\styles
         -copy $(TOP)\libview\styles\*.style resources\stx\libview\styles\*.*
         -copy $(TOP)\libview\styles\*.common resources\stx\libview\styles\*.*
 
 stx_BITMAPS: \
         libwidg_BITMAPS
 
-libwidg_BITMAPS: resources\stx\libwidg\bitmaps\NUL
+libwidg_BITMAPS: resources\stx\libwidg\bitmaps
         -copy $(TOP)\libwidg\bitmaps\*.xpm resources\stx\libwidg\bitmaps\*.*
 
-libbasic_RESOURCES: resources\stx\libbasic\NUL
+libbasic_RESOURCES: resources\stx\libbasic
         -copy $(TOP)\libbasic\resources\*.rs resources\stx\libbasic\*.*
 
-libtool_RESOURCES: resources\stx\libtool\NUL
+libtool_RESOURCES: resources\stx\libtool
         -copy $(TOP)\libtool\resources\*.rs resources\stx\libtool\*.*
 
-libtool2_RESOURCES: resources\stx\libtool2\NUL
+libtool2_RESOURCES: resources\stx\libtool2
         -copy $(TOP)\libtool2\resources\*.rs resources\stx\libtool2\*.*
 
-libview_RESOURCES: resources\stx\libview\NUL 
+libview_RESOURCES: resources\stx\libview 
         -copy $(TOP)\libview\resources\*.rs resources\stx\libview\*.*
 
-libview2_RESOURCES: resources\stx\libview2\NUL
+libview2_RESOURCES: resources\stx\libview2
         -copy $(TOP)\libview2\resources\*.rs resources\stx\libview2\*.*
 
-resources\stx\libbasic\NUL: resources\stx\NUL
+resources\stx\libbasic: resources\stx
         mkdir resources\stx\libbasic
 
-resources\stx\libtool\NUL: resources\stx\NUL
+resources\stx\libtool: resources\stx
         mkdir resources\stx\libtool
 
-resources\stx\libtool2\NUL: resources\stx\NUL
+resources\stx\libtool2: resources\stx
         mkdir resources\stx\libtool2
 
-resources\stx\libview\NUL: resources\stx\NUL
+resources\stx\libview: resources\stx
         mkdir resources\stx\libview
 
-resources\stx\libview\styles\NUL: resources\stx\libview\NUL
+resources\stx\libview\styles: resources\stx\libview
         mkdir resources\stx\libview\styles
 
-resources\stx\libview2\NUL: resources\stx\NUL
+resources\stx\libview2: resources\stx
         mkdir resources\stx\libview2
 
-resources\stx\libwidg\bitmaps\NUL: resources\stx\libwidg\NUL
+resources\stx\libwidg\bitmaps: resources\stx\libwidg
         mkdir resources\stx\libwidg\bitmaps
 
-resources\stx\libwidg\NUL: resources\stx\NUL
+resources\stx\libwidg: resources\stx
         mkdir resources\stx\libwidg
 
-resources\stx\NUL: resources\NUL
+resources\stx: resources
         mkdir resources\stx
 
-resources\NUL:
+resources:
         mkdir resources
 
-bitmaps\NUL:
+bitmaps:
         mkdir bitmaps
 
-doc\NUL:
+doc:
         mkdir doc
 
 '.
 
     "Created: / 20-09-2006 / 17:36:29 / cg"
     "Modified: / 06-06-2016 / 16:06:01 / cg"
+    "Modified: / 29-08-2018 / 13:29:25 / svestkap"
 !
 
 bc_dot_mak_stx_source_rules
@@ -2247,22 +2251,23 @@
         s nextPutAll:'
 STX_SOURCES:'.
         libDirs do:[:libDir |
-            s nextPutAll:' '; nextPutAll:('sources\stx\',libDir,'\NUL')
+            s nextPutAll:' '; nextPutAll:('sources\stx\',libDir)
         ].
         s cr.
 
         libDirs do:[:libDir |
-            s nextPutLine:('sources\stx\',libDir,'\NUL: sources\stx\NUL').
+            s nextPutLine:('sources\stx\',libDir,': sources\stx').
             s tab; nextPutLine:('mkdir sources\stx\',libDir).
             s tab; nextPutLine:('-copy $(TOP)\',libDir,'\*.st sources\stx\',libDir,'\*.*').
             s cr.
         ].
-        s nextPutLine:'sources\stx\NUL: sources\NUL'.
+        s nextPutLine:'sources\stx: sources'.
         s tab; nextPutLine:'mkdir sources\stx'.
         s cr.
     ]
 
     "Created: / 15-05-2007 / 17:27:37 / cg"
+    "Modified: / 29-08-2018 / 13:23:42 / svestkap"
 !
 
 bmake_dot_mak
--- a/FolderForProjectsDefinition.st	Fri May 25 12:46:21 2018 +0200
+++ b/FolderForProjectsDefinition.st	Wed Aug 29 14:15:11 2018 +0200
@@ -124,7 +124,7 @@
 
 %(ADDITIONAL_HEADERRULES)
 
-test: $(TOP)\goodies\builder\reports\NUL
+test: $(TOP)\goodies\builder\reports
         pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
         $(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
 
--- a/LibraryDefinition.st	Fri May 25 12:46:21 2018 +0200
+++ b/LibraryDefinition.st	Wed Aug 29 14:15:11 2018 +0200
@@ -337,7 +337,7 @@
 
 %(ADDITIONAL_HEADERRULES)
 
-test: $(TOP)\goodies\builder\reports\NUL
+test: $(TOP)\goodies\builder\reports
         pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
         $(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
hg/stx-libbasic