Ticket #238: libbasic_fix_1_of_1_rev_240af7139d7c_Issue__238__The_generated_make_file_bc_mak_fails_on_Windows_10_Version_1703__OS_build_15063_1266_.patch

File libbasic_fix_1_of_1_rev_240af7139d7c_Issue__238__The_generated_make_file_bc_mak_fails_on_Windows_10_Version_1703__OS_build_15063_1266_.patch, 8.2 KB (added by patrik.svestka@…, 6 years ago)

  • ApplicationDefinition.st 

    # HG changeset patch
# User Patrik Svestka <patrik.svestka@gmail.com>
# Date 1535544911 -7200
#      Wed Aug 29 14:15:11 2018 +0200
# Branch jv
# Node ID 240af7139d7cd02c5eb679cb62d6cb845eb24389
# Parent  5811aa416119ad4bff8b9f36b068e24a6cc3e9af
Issue #238: The generated make file bc.mak fails on Windows 10 Version 1703 (OS build 15063.1266)

Removing '\NUL' string at the end of the path and label.  My guess is that it is similar to the
batch file: IF EXIST <path>\NUL echo "exists".

Comment for the batch files:
The \NUL technique is not reliable on NT class windows. It was fine in MSDOS and Win9x however.
The solution in modern Windows is simply if exist "c\:folder\" echo folder exists

diff -r 5811aa416119 -r 240af7139d7c ApplicationDefinition.st
    a b  
    18931893%(PREREQUISITES_LIBS)     
    18941894%(SUBPROJECTS_LINES)
    18951895
    1896 sources\NUL:
     1896sources:
    18971897        mkdir sources
    18981898
    18991899show:
    … …  
    20392039    "Modified: / 03-03-2016 / 21:15:43 / cg"
    20402040    "Modified: / 19-01-2017 / 11:50:05 / stefan"
    20412041    "Modified: / 25-01-2017 / 20:03:01 / jv"
     2042    "Modified: / 29-08-2018 / 13:32:38 / svestkap"
    20422043!
    20432044
    20442045bc_dot_mak_app_source_rules
    … …  
    20462047
    20472048    ^ String streamContents:[:s |
    20482049        s nextPutAll:'
    2049 %(APPLICATION)_SOURCES: sources\%(MODULE)\%(MODULE_PATH)\NUL
     2050%(APPLICATION)_SOURCES: sources\%(MODULE)\%(MODULE_PATH)
    20502051        -copy ..\*.st sources\%(MODULE)\%(MODULE_PATH)\..\*.*
    20512052
    20522053'.
    … …  
    20582059            part2 := (p copyTo:len) asStringWith:$\.
    20592060            part1 := (p copyTo:len-1) asStringWith:$\.
    20602061            s nextPutAll:'
    2061 sources\%(MODULE)\',part2,'\NUL: sources\%(MODULE)\',part1,'\NUL
     2062sources\%(MODULE)\',part2,': sources\%(MODULE)\',part1,'
    20622063        mkdir sources\%(MODULE)\',part2,'
    20632064'.
    20642065            s cr.
    20652066        ].
    20662067
    20672068        s nextPutAll:'
    2068 sources\%(MODULE)\',p first,'\NUL: sources\%(MODULE)\NUL
     2069sources\%(MODULE)\',p first,': sources\%(MODULE)
    20692070        mkdir sources\%(MODULE)\',p first,'
    20702071'.
    20712072        s cr.
    … …  
    20732074        "/ be careful to not include two rules for it (-> stx_source_rules).
    20742075        self module ~= 'stx' ifTrue:[
    20752076            s nextPutAll:
    2076 'sources\%(MODULE)\NUL: sources\NUL
     2077'sources\%(MODULE): sources
    20772078        mkdir sources\%(MODULE)
    20782079'.
    20792080        ].
    20802081    ]
    20812082
    20822083    "Created: / 15-05-2007 / 17:27:37 / cg"
     2084    "Modified: / 29-08-2018 / 13:32:23 / svestkap"
    20832085!
    20842086
    20852087bc_dot_mak_resource_rules
    … …  
    20872089
    20882090    ^ String streamContents:[:s |
    20892091        s nextPutAll:'
    2090 %(APPLICATION)_RESOURCES: resources\%(MODULE)\%(MODULE_PATH)\NUL
     2092%(APPLICATION)_RESOURCES: resources\%(MODULE)\%(MODULE_PATH)
    20912093        -copy ..\resources\*.rs resources\%(MODULE)\%(MODULE_PATH)\..
    20922094        -copy ..\resources\*.style resources\%(MODULE)\%(MODULE_PATH)\..
    20932095
    2094 %(APPLICATION)_BITMAPS: resources\%(MODULE)\%(MODULE_PATH)\bitmaps\NUL
     2096%(APPLICATION)_BITMAPS: resources\%(MODULE)\%(MODULE_PATH)\bitmaps
    20952097        -copy *.ico resources\%(MODULE)\%(MODULE_PATH)\bitmaps
    20962098        -copy *.gif resources\%(MODULE)\%(MODULE_PATH)\bitmaps
    20972099
    2098 resources\%(MODULE)\%(MODULE_PATH)\bitmaps\NUL: resources\%(MODULE)\%(MODULE_PATH)\NUL
     2100resources\%(MODULE)\%(MODULE_PATH)\bitmaps: resources\%(MODULE)\%(MODULE_PATH)
    20992101        mkdir resources\%(MODULE)\%(MODULE_PATH)\bitmaps
    21002102'.
    21012103
    … …  
    21062108            part2 := (p copyTo:len) asStringWith:$\.
    21072109            part1 := (p copyTo:len-1) asStringWith:$\.
    21082110            s nextPutAll:'
    2109 resources\%(MODULE)\',part2,'\NUL: resources\%(MODULE)\',part1,'\NUL
     2111resources\%(MODULE)\',part2,': resources\%(MODULE)\',part1,'
    21102112        mkdir resources\%(MODULE)\',part2,'
    21112113'.
    21122114        ].
    21132115
    21142116        s nextPutAll:'
    2115 resources\%(MODULE)\',p first,'\NUL: resources\%(MODULE)\NUL
     2117resources\%(MODULE)\',p first,': resources\%(MODULE)
    21162118        mkdir resources\%(MODULE)\',p first,'
    21172119'.
    21182120
    21192121        "/ be careful to not include two rules for it (-> stx_resource_rules).
    21202122        self module ~= 'stx' ifTrue:[
    21212123            s nextPutAll:
    2122 'resources\%(MODULE)\NUL: resources\NUL
     2124'resources\%(MODULE): resources
    21232125        mkdir resources\%(MODULE)
    21242126'.
    21252127        ].
    21262128    ]
    21272129
    21282130    "Modified: / 09-02-2007 / 16:13:43 / cg"
     2131    "Modified: / 29-08-2018 / 13:31:41 / svestkap"
    21292132!
    21302133
    21312134bc_dot_mak_stx_resource_rules
    … …  
    21372140stx_RESOURCES: \
    21382141        keyboard.rc \
    21392142        keyboardMacros.rc \
    2140         host.rc \       
     2143        host.rc \         
    21412144        display.rc \
    21422145        d_win32.rc \
    21432146        libbasic_RESOURCES \
    … …  
    21712174d_win32.rc: $(TOP)\projects\smalltalk\d_win32.rc
    21722175        copy $(TOP)\projects\smalltalk\d_win32.rc *.*
    21732176
    2174 stx_STYLES: resources\stx\libview\NUL resources\stx\libview\styles\NUL
     2177stx_STYLES: resources\stx\libview  resources\stx\libview\styles
    21752178        -copy $(TOP)\libview\styles\*.style resources\stx\libview\styles\*.*
    21762179        -copy $(TOP)\libview\styles\*.common resources\stx\libview\styles\*.*
    21772180
    21782181stx_BITMAPS: \
    21792182        libwidg_BITMAPS
    21802183
    2181 libwidg_BITMAPS: resources\stx\libwidg\bitmaps\NUL
     2184libwidg_BITMAPS: resources\stx\libwidg\bitmaps
    21822185        -copy $(TOP)\libwidg\bitmaps\*.xpm resources\stx\libwidg\bitmaps\*.*
    21832186
    2184 libbasic_RESOURCES: resources\stx\libbasic\NUL
     2187libbasic_RESOURCES: resources\stx\libbasic
    21852188        -copy $(TOP)\libbasic\resources\*.rs resources\stx\libbasic\*.*
    21862189
    2187 libtool_RESOURCES: resources\stx\libtool\NUL
     2190libtool_RESOURCES: resources\stx\libtool
    21882191        -copy $(TOP)\libtool\resources\*.rs resources\stx\libtool\*.*
    21892192
    2190 libtool2_RESOURCES: resources\stx\libtool2\NUL
     2193libtool2_RESOURCES: resources\stx\libtool2
    21912194        -copy $(TOP)\libtool2\resources\*.rs resources\stx\libtool2\*.*
    21922195
    2193 libview_RESOURCES: resources\stx\libview\NUL
     2196libview_RESOURCES: resources\stx\libview
    21942197        -copy $(TOP)\libview\resources\*.rs resources\stx\libview\*.*
    21952198
    2196 libview2_RESOURCES: resources\stx\libview2\NUL
     2199libview2_RESOURCES: resources\stx\libview2
    21972200        -copy $(TOP)\libview2\resources\*.rs resources\stx\libview2\*.*
    21982201
    2199 resources\stx\libbasic\NUL: resources\stx\NUL
     2202resources\stx\libbasic: resources\stx
    22002203        mkdir resources\stx\libbasic
    22012204
    2202 resources\stx\libtool\NUL: resources\stx\NUL
     2205resources\stx\libtool: resources\stx
    22032206        mkdir resources\stx\libtool
    22042207
    2205 resources\stx\libtool2\NUL: resources\stx\NUL
     2208resources\stx\libtool2: resources\stx
    22062209        mkdir resources\stx\libtool2
    22072210
    2208 resources\stx\libview\NUL: resources\stx\NUL
     2211resources\stx\libview: resources\stx
    22092212        mkdir resources\stx\libview
    22102213
    2211 resources\stx\libview\styles\NUL: resources\stx\libview\NUL
     2214resources\stx\libview\styles: resources\stx\libview
    22122215        mkdir resources\stx\libview\styles
    22132216
    2214 resources\stx\libview2\NUL: resources\stx\NUL
     2217resources\stx\libview2: resources\stx
    22152218        mkdir resources\stx\libview2
    22162219
    2217 resources\stx\libwidg\bitmaps\NUL: resources\stx\libwidg\NUL
     2220resources\stx\libwidg\bitmaps: resources\stx\libwidg
    22182221        mkdir resources\stx\libwidg\bitmaps
    22192222
    2220 resources\stx\libwidg\NUL: resources\stx\NUL
     2223resources\stx\libwidg: resources\stx
    22212224        mkdir resources\stx\libwidg
    22222225
    2223 resources\stx\NUL: resources\NUL
     2226resources\stx: resources
    22242227        mkdir resources\stx
    22252228
    2226 resources\NUL:
     2229resources:
    22272230        mkdir resources
    22282231
    2229 bitmaps\NUL:
     2232bitmaps:
    22302233        mkdir bitmaps
    22312234
    2232 doc\NUL:
     2235doc:
    22332236        mkdir doc
    22342237
    22352238'.
    22362239
    22372240    "Created: / 20-09-2006 / 17:36:29 / cg"
    22382241    "Modified: / 06-06-2016 / 16:06:01 / cg"
     2242    "Modified: / 29-08-2018 / 13:29:25 / svestkap"
    22392243!
    22402244
    22412245bc_dot_mak_stx_source_rules
    … …  
    22472251        s nextPutAll:'
    22482252STX_SOURCES:'.
    22492253        libDirs do:[:libDir |
    2250             s nextPutAll:' '; nextPutAll:('sources\stx\',libDir,'\NUL')
     2254            s nextPutAll:' '; nextPutAll:('sources\stx\',libDir)
    22512255        ].
    22522256        s cr.
    22532257
    22542258        libDirs do:[:libDir |
    2255             s nextPutLine:('sources\stx\',libDir,'\NUL: sources\stx\NUL').
     2259            s nextPutLine:('sources\stx\',libDir,': sources\stx').
    22562260            s tab; nextPutLine:('mkdir sources\stx\',libDir).
    22572261            s tab; nextPutLine:('-copy $(TOP)\',libDir,'\*.st sources\stx\',libDir,'\*.*').
    22582262            s cr.
    22592263        ].
    2260         s nextPutLine:'sources\stx\NUL: sources\NUL'.
     2264        s nextPutLine:'sources\stx: sources'.
    22612265        s tab; nextPutLine:'mkdir sources\stx'.
    22622266        s cr.
    22632267    ]
    22642268
    22652269    "Created: / 15-05-2007 / 17:27:37 / cg"
     2270    "Modified: / 29-08-2018 / 13:23:42 / svestkap"
    22662271!
    22672272
    22682273bmake_dot_mak