--- a/ApplicationDefinition.st Sun Oct 14 08:48:33 2018 +0200
+++ b/ApplicationDefinition.st Sun Oct 14 14:32:14 2018 +0200
@@ -685,7 +685,7 @@
('symbols.stc' 'bin')
('*.stx' 'bin')
('*.rc' 'bin')
- ('resources' 'bin')
+ ('.resources' 'bin')
)
"Created: / 01-03-2007 / 20:05:40 / cg"
@@ -702,7 +702,7 @@
'"symbols.stc"'
'"*.stx"'
'"*.rc"'
- '/r /x CVS /x ".*" resources'
+ '/r /x CVS /x ".*" .resources'
)
"Created: / 01-03-2007 / 20:05:40 / cg"
@@ -2128,7 +2128,7 @@
-del main.c
-del *.log
-del *.$(RES)
- -rmdir /S /Q resources
+ -rmdir /S /Q $(RESOURCES)
-rmdir /S /Q $(OBJDIR)
clobber:: clean
@@ -2165,14 +2165,14 @@
^ String streamContents:[:s |
s nextPutAll:'
%(APPLICATION)_RESOURCES:
- -mkdir resources\%(MODULE)\%(MODULE_PATH)
- -copy ..\resources\*.rs resources\%(MODULE)\%(MODULE_PATH)\..
- -copy ..\resources\*.style resources\%(MODULE)\%(MODULE_PATH)\..
+ -mkdir $(RESOURCES)\%(MODULE)\%(MODULE_PATH)
+ -copy ..\resources\*.rs $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\..
+ -copy ..\resources\*.style $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\..
%(APPLICATION)_BITMAPS:
- -mkdir resources\%(MODULE)\%(MODULE_PATH)\bitmaps
- -copy *.ico resources\%(MODULE)\%(MODULE_PATH)\bitmaps
- -copy *.gif resources\%(MODULE)\%(MODULE_PATH)\bitmaps
+ -mkdir $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\bitmaps
+ -copy *.ico $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\bitmaps
+ -copy *.gif $(RESOURCES)\%(MODULE)\%(MODULE_PATH)\bitmaps
'.
]
@@ -2227,36 +2227,36 @@
copy $(TOP)\projects\smalltalk\d_win32.rc *.*
stx_STYLES:
- -mkdir resources\stx\libview\styles
- -copy $(TOP)\libview\styles\*.style resources\stx\libview\styles\*.*
- -copy $(TOP)\libview\styles\*.common resources\stx\libview\styles\*.*
+ -mkdir $(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:
- -mkdir resources\stx\libwidg\bitmaps
- -copy $(TOP)\libwidg\bitmaps\*.xpm resources\stx\libwidg\bitmaps\*.*
+ -mkdir $(RESOURCES)\stx\libwidg\bitmaps
+ -copy $(TOP)\libwidg\bitmaps\*.xpm $(RESOURCES)\stx\libwidg\bitmaps\*.*
libbasic_RESOURCES:
- -mkdir resources\stx\libbasic
- -copy $(TOP)\libbasic\resources\*.rs resources\stx\libbasic\*.*
+ -mkdir $(RESOURCES)\stx\libbasic
+ -copy $(TOP)\libbasic\resources\*.rs $(RESOURCES)\stx\libbasic\*.*
libtool_RESOURCES:
- -mkdir resources\stx\libtool
- -copy $(TOP)\libtool\resources\*.rs resources\stx\libtool\*.*
+ -mkdir $(RESOURCES)\stx\libtool
+ -copy $(TOP)\libtool\resources\*.rs $(RESOURCES)\stx\libtool\*.*
libtool2_RESOURCES:
- -mkdir resources\stx\libtool2
- -copy $(TOP)\libtool2\resources\*.rs resources\stx\libtool2\*.*
+ -mkdir $(RESOURCES)\stx\libtool2
+ -copy $(TOP)\libtool2\resources\*.rs $(RESOURCES)\stx\libtool2\*.*
libview_RESOURCES:
- -mkdir resources\stx\libview
- -copy $(TOP)\libview\resources\*.rs resources\stx\libview\*.*
+ -mkdir $(RESOURCES)\stx\libview
+ -copy $(TOP)\libview\resources\*.rs $(RESOURCES)\stx\libview\*.*
libview2_RESOURCES:
- -mkdir resources\stx\libview2
- -copy $(TOP)\libview2\resources\*.rs resources\stx\libview2\*.*
+ -mkdir $(RESOURCES)\stx\libview2
+ -copy $(TOP)\libview2\resources\*.rs $(RESOURCES)\stx\libview2\*.*
'.
!
@@ -2611,12 +2611,12 @@
^ String streamContents:[:s |
s nextPutAll:'
%(APPLICATION)_RESOURCES:
- mkdir -p resources/%(MODULE)/%(MODULE_PATH)
- -cp ../resources/*.rs ../resources/*.style resources/%(MODULE)/%(MODULE_PATH)/..
+ mkdir -p $(RESOURCES)/%(MODULE)/%(MODULE_PATH)
+ -cp ../resources/*.rs ../resources/*.style $(RESOURCES)/%(MODULE)/%(MODULE_PATH)/..
%(APPLICATION)_BITMAPS:
- mkdir -p resources/%(MODULE)/%(MODULE_PATH)/bitmaps
- -cp *.ico *.gif *.png resources/%(MODULE)/%(MODULE_PATH)/bitmaps
+ mkdir -p $(RESOURCES)/%(MODULE)/%(MODULE_PATH)/bitmaps
+ -cp *.ico *.gif *.png $(RESOURCES)/%(MODULE)/%(MODULE_PATH)/bitmaps
'.
].
!
@@ -2641,8 +2641,8 @@
stx_BITMAPS:
libbasic_RESOURCES:
- mkdir -p resources/stx/libbasic
- -cp $(TOP)/libbasic/resources/*.* resources/stx/libbasic
+ mkdir -p $(RESOURCES)/stx/libbasic
+ -cp $(TOP)/libbasic/resources/*.* $(RESOURCES)/stx/libbasic
'
].
@@ -2668,37 +2668,37 @@
cp $(TOP)/projects/smalltalk/display.rc .
stx_STYLES:
- mkdir -p resources/stx/libview
- mkdir -p resources/stx/libview/styles
- cp $(TOP)/libview/styles/*.common resources/stx/libview/styles
- cp $(TOP)/libview/styles/*.style resources/stx/libview/styles
+ mkdir -p $(RESOURCES)/stx/libview
+ mkdir -p $(RESOURCES)/stx/libview/styles
+ cp $(TOP)/libview/styles/*.common $(RESOURCES)/stx/libview/styles
+ cp $(TOP)/libview/styles/*.style $(RESOURCES)/stx/libview/styles
stx_BITMAPS: \
libwidg_BITMAPS
libwidg_BITMAPS:
- mkdir -p resources/stx/libwidg/bitmaps
- -cp $(TOP)/libwidg/bitmaps/*.* resources/stx/libwidg/bitmaps
+ mkdir -p $(RESOURCES)/stx/libwidg/bitmaps
+ -cp $(TOP)/libwidg/bitmaps/*.* $(RESOURCES)/stx/libwidg/bitmaps
libbasic_RESOURCES:
- mkdir -p resources/stx/libbasic
- -cp $(TOP)/libbasic/resources/*.* resources/stx/libbasic
+ mkdir -p $(RESOURCES)/stx/libbasic
+ -cp $(TOP)/libbasic/resources/*.* $(RESOURCES)/stx/libbasic
libtool_RESOURCES:
- mkdir -p resources/stx/libtool
- -cp $(TOP)/libtool/resources/*.* resources/stx/libtool
+ mkdir -p $(RESOURCES)/stx/libtool
+ -cp $(TOP)/libtool/resources/*.* $(RESOURCES)/stx/libtool
libtool2_RESOURCES:
- mkdir -p resources/stx/libtool2
- -cp $(TOP)/libtool2/resources/*.* resources/stx/libtool2
+ mkdir -p $(RESOURCES)/stx/libtool2
+ -cp $(TOP)/libtool2/resources/*.* $(RESOURCES)/stx/libtool2
libview_RESOURCES:
- mkdir -p resources/stx/libview
- -cp $(TOP)/libview/resources/*.* resources/stx/libview
+ mkdir -p $(RESOURCES)/stx/libview
+ -cp $(TOP)/libview/resources/*.* $(RESOURCES)/stx/libview
libview2_RESOURCES:
- mkdir -p resources/stx/libview2
- -cp $(TOP)/libview2/resources/*.* resources/stx/libview2
+ mkdir -p $(RESOURCES)/stx/libview2
+ -cp $(TOP)/libview2/resources/*.* $(RESOURCES)/stx/libview2
bitmaps:
mkdir -p bitmaps