--- a/RegressionTests__ProjectDefinitionTests.st Fri Jul 28 11:18:21 2017 +0100
+++ b/RegressionTests__ProjectDefinitionTests.st Mon Jul 24 21:21:01 2017 +0200
@@ -36,6 +36,134 @@
"Created: / 22-03-2013 / 11:31:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!ProjectDefinitionTests methodsFor:'tests - regression'!
+
+test_issue63_01
+
+ | classes1 classes2 code |
+
+ classes1 := stx_libbasic classNamesAndAttributes.
+ code := stx_libbasic classNamesAndAttributes_code_ignoreOldEntries: false ignoreOldDefinition: false.
+ classes2 := Compiler evaluate: (code copyFrom: 'classNamesAndAttributes' size + 1).
+
+ self assert: (classes1 \ classes2) isEmpty.
+ self assert: (classes2 \ classes1) isEmpty.
+
+ "Created: / 20-07-2017 / 17:36:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 24-07-2017 / 21:05:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+test_issue63_02u
+ "
+ Issue #63: Test if platform-specific attribute is preserved
+ across class renames.
+
+ See https://swing.fit.cvut.cz/projects/stx-jv/ticket/63
+ "
+
+ | pkg pkgDef classes code |
+
+ self skipIf: OperatingSystem isUNIXlike not description: 'This test in UNIX specific'.
+
+ pkg := 'stx:goodies/regression/testData/packages/p2platform_specific_classes'.
+ Smalltalk loadPackage: pkg.
+ pkgDef := ProjectDefinition definitionClassForPackage: pkg.
+ classes := pkgDef classNamesAndAttributes.
+ self assert: (classes includes: #(UnixSpecificClass unix)).
+ self assert: (classes includes: #(VMSSpecificClass vms)).
+ self assert: (classes includes: #(Win32SpecificClass win32)).
+ self assert: (Smalltalk includesKey: #UnixSpecificClass).
+ self assert: (Smalltalk includesKey: #Win32SpecificClass) not.
+ self assert: (Smalltalk includesKey: #VMSSpecificClass) not.
+
+
+ Smalltalk renameClass: (Smalltalk at: #UnixSpecificClass) to: #XXXXSpecificClass.
+ code := pkgDef classNamesAndAttributes_code_ignoreOldEntries: false ignoreOldDefinition: false.
+ classes := Compiler evaluate: (code copyFrom: 'classNamesAndAttributes' size + 1).
+ self assert: (classes includes: #(XXXXSpecificClass unix)).
+ self assert: (classes includes: #(VMSSpecificClass vms)).
+ self assert: (classes includes: #(Win32SpecificClass win32)).
+
+ Smalltalk renameClass: (Smalltalk at: #XXXXSpecificClass) to: #YYYYSpecificClass.
+ code := pkgDef classNamesAndAttributes_code_ignoreOldEntries: false ignoreOldDefinition: false.
+ classes := Compiler evaluate: (code copyFrom: 'classNamesAndAttributes' size + 1).
+ self assert: (classes includes: #(YYYYSpecificClass unix)).
+ self assert: (classes includes: #(VMSSpecificClass vms)).
+ self assert: (classes includes: #(Win32SpecificClass win32)).
+
+ Smalltalk renameClass: (Smalltalk at: #YYYYSpecificClass) to: #UnixSpecificClass.
+ code := pkgDef classNamesAndAttributes_code_ignoreOldEntries: false ignoreOldDefinition: false.
+ classes := Compiler evaluate: (code copyFrom: 'classNamesAndAttributes' size + 1).
+ self assert: (classes includes: #(UnixSpecificClass unix)).
+ self assert: (classes includes: #(VMSSpecificClass vms)).
+ self assert: (classes includes: #(Win32SpecificClass win32)).
+
+ Smalltalk renameClass: (Smalltalk at: #UnixSpecificClass) to: #ZZZZSpecificClass.
+ code := pkgDef classNamesAndAttributes_code_ignoreOldEntries: false ignoreOldDefinition: false.
+ classes := Compiler evaluate: (code copyFrom: 'classNamesAndAttributes' size + 1).
+ self assert: (classes includes: #(ZZZZSpecificClass unix)).
+ self assert: (classes includes: #(VMSSpecificClass vms)).
+ self assert: (classes includes: #(Win32SpecificClass win32)).
+
+ "Created: / 26-07-2017 / 22:57:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 27-07-2017 / 10:49:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+test_issue63_02w
+ "
+ Issue #63: Test if platform-specific attribute is preserved
+ across class renames.
+
+ See https://swing.fit.cvut.cz/projects/stx-jv/ticket/63
+ "
+
+ | pkg pkgDef classes code |
+
+ self skipIf: OperatingSystem isMSWINDOWSlike not description: 'This test in Windows specific'.
+
+ pkg := 'stx:goodies/regression/testData/packages/p2platform_specific_classes'.
+ Smalltalk loadPackage: pkg.
+ pkgDef := ProjectDefinition definitionClassForPackage: pkg.
+ classes := pkgDef classNamesAndAttributes.
+ self assert: (classes includes: #(UnixSpecificClass unix)).
+ self assert: (classes includes: #(VMSSpecificClass vms)).
+ self assert: (classes includes: #(Win32SpecificClass win32)).
+ self assert: (Smalltalk includesKey: #UnixSpecificClass) not.
+ self assert: (Smalltalk includesKey: #Win32SpecificClass).
+ self assert: (Smalltalk includesKey: #VMSSpecificClass) not.
+
+
+ Smalltalk renameClass: (Smalltalk at: #Win32SpecificClass) to: #XXXXSpecificClass.
+ code := pkgDef classNamesAndAttributes_code_ignoreOldEntries: false ignoreOldDefinition: false.
+ classes := Compiler evaluate: (code copyFrom: 'classNamesAndAttributes' size + 1).
+ self assert: (classes includes: #(UnixSpecificClass unix)).
+ self assert: (classes includes: #(VMSSpecificClass vms)).
+ self assert: (classes includes: #(XXXXSpecificClass win32)).
+
+ Smalltalk renameClass: (Smalltalk at: #XXXXSpecificClass) to: #YYYYSpecificClass.
+ code := pkgDef classNamesAndAttributes_code_ignoreOldEntries: false ignoreOldDefinition: false.
+ classes := Compiler evaluate: (code copyFrom: 'classNamesAndAttributes' size + 1).
+ self assert: (classes includes: #(UnixSpecificClass unix)).
+ self assert: (classes includes: #(VMSSpecificClass vms)).
+ self assert: (classes includes: #(YYYYSpecificClass win32)).
+
+ Smalltalk renameClass: (Smalltalk at: #YYYYSpecificClass) to: #Win32SpecificClass.
+ code := pkgDef classNamesAndAttributes_code_ignoreOldEntries: false ignoreOldDefinition: false.
+ classes := Compiler evaluate: (code copyFrom: 'classNamesAndAttributes' size + 1).
+ self assert: (classes includes: #(UnixSpecificClass unix)).
+ self assert: (classes includes: #(VMSSpecificClass vms)).
+ self assert: (classes includes: #(Win32SpecificClass win32)).
+
+ Smalltalk renameClass: (Smalltalk at: #Win32SpecificClass) to: #ZZZZSpecificClass.
+ code := pkgDef classNamesAndAttributes_code_ignoreOldEntries: false ignoreOldDefinition: false.
+ classes := Compiler evaluate: (code copyFrom: 'classNamesAndAttributes' size + 1).
+ self assert: (classes includes: #(UnixSpecificClass unix)).
+ self assert: (classes includes: #(VMSSpecificClass vms)).
+ self assert: (classes includes: #(ZZZZSpecificClass win32)).
+
+ "Created: / 27-07-2017 / 10:51:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!ProjectDefinitionTests methodsFor:'tests - utf8'!
test_filein_01
@@ -136,5 +264,10 @@
version_CVS
^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/packages/p2platform_specific_classes/Make.proto Mon Jul 24 21:21:01 2017 +0200
@@ -0,0 +1,128 @@
+# $Header$
+#
+# DO NOT EDIT
+# automagically generated from the projectDefinition: stx_goodies_regression_testData_packages_p2platform_specific_classes.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# The Makefile as generated by this Make.proto supports the following targets:
+# make - compile all st-files to a classLib
+# make clean - clean all temp files
+# make clobber - clean all
+#
+# This file contains definitions for Unix based platforms.
+# It shares common definitions with the win32-make in Make.spec.
+
+#
+# position (of this package) in directory hierarchy:
+# (must point to ST/X top directory, for tools and includes)
+TOP=../../../../..
+INCLUDE_TOP=$(TOP)/..
+
+# subdirectories where targets are to be made:
+SUBDIRS=
+
+
+# subdirectories where Makefiles are to be made:
+# (only define if different from SUBDIRS)
+# ALLSUBDIRS=
+
+REQUIRED_SUPPORT_DIRS=
+
+# if your embedded C code requires any system includes,
+# add the path(es) here:,
+# ********** OPTIONAL: MODIFY the next lines ***
+# LOCALINCLUDES=-Ifoo -Ibar
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic
+
+
+# if you need any additional defines for embedded C code,
+# add them here:,
+# ********** OPTIONAL: MODIFY the next lines ***
+# LOCALDEFINES=-Dfoo -Dbar -DDEBUG
+LOCALDEFINES=
+
+LIBNAME=libstx_goodies_regression_testData_packages_p2platform_specific_classes
+STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=. -varPrefix=$(LIBNAME)
+
+
+# ********** OPTIONAL: MODIFY the next line ***
+# additional C-libraries that should be pre-linked with the class-objects
+LD_OBJ_LIBS=
+LOCAL_SHARED_LIBS=
+
+
+# ********** OPTIONAL: MODIFY the next line ***
+# additional C targets or libraries should be added below
+LOCAL_EXTRA_TARGETS=
+
+OBJS= $(COMMON_OBJS) $(UNIX_OBJS)
+
+
+
+all:: preMake classLibRule postMake
+
+pre_objs::
+
+
+
+
+
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
+stx_goodies_regression_testData_packages_p2platform_specific_classes.$(O): $(shell hg root)/.hg/dirstate
+endif
+
+
+
+
+# run default testsuite for this package
+test: $(TOP)/goodies/builder/reports
+ $(MAKE) -C $(TOP)/goodies/builder/reports -f Makefile.init
+ $(TOP)/goodies/builder/reports/report-runner.sh -D . -r Builder::TestReport -p $(PACKAGE)
+
+
+
+# add more install actions here
+install::
+
+# add more install actions for aux-files (resources) here
+installAux::
+
+# add more preMake actions here
+preMake::
+
+# add more postMake actions here
+postMake:: cleanjunk
+
+# build all mandatory prerequisite packages (containing superclasses) for this package
+prereq:
+ cd ../../../../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+
+
+# build all packages containing referenced classes for this package
+# they are not needed to compile the package (but later, to load it)
+references:
+
+
+cleanjunk::
+ -rm -f *.s *.s2
+
+clean::
+ -rm -f *.o *.H
+
+clobber:: clean
+ -rm -f *.so *.dll
+
+
+# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)stx_goodies_regression_testData_packages_p2platform_specific_classes.$(O) stx_goodies_regression_testData_packages_p2platform_specific_classes.$(C) stx_goodies_regression_testData_packages_p2platform_specific_classes.$(H): stx_goodies_regression_testData_packages_p2platform_specific_classes.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
+$(OUTDIR)UnixSpecificClass.$(O) UnixSpecificClass.$(C) UnixSpecificClass.$(H): UnixSpecificClass.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+
+# ENDMAKEDEPEND --- do not remove this line
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/packages/p2platform_specific_classes/Make.spec Mon Jul 24 21:21:01 2017 +0200
@@ -0,0 +1,81 @@
+# $Header$
+#
+# DO NOT EDIT
+# automagically generated from the projectDefinition: stx_goodies_regression_testData_packages_p2platform_specific_classes.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# This file contains specifications which are common to all platforms.
+#
+
+# Do NOT CHANGE THESE DEFINITIONS
+# (otherwise, ST/X will have a hard time to find out the packages location from its packageID,
+# to find the source code of a class and to find the library for a package)
+MODULE=stx
+MODULE_DIR=goodies/regression/testData/packages/p2platform_specific_classes
+PACKAGE=$(MODULE):$(MODULE_DIR)
+
+
+# Argument(s) to the stc compiler (stc --usage).
+# -headerDir=. : create header files locally
+# (if removed, they will be created as common
+# -Pxxx : defines the package
+# -Zxxx : a prefix for variables within the classLib
+# -Dxxx : defines passed to CC for inline C-code
+# -Ixxx : include path passed to CC for inline C-code
+# +optspace : optimized for space
+# +optspace2 : optimized more for space
+# +optspace3 : optimized even more for space
+# +optinline : generate inline code for some ST constructs
+# +inlineNew : additionally inline new
+# +inlineMath : additionally inline some floatPnt math stuff
+#
+# ********** OPTIONAL: MODIFY the next line(s) ***
+# STCLOCALOPTIMIZATIONS=+optinline +inlineNew
+# STCLOCALOPTIMIZATIONS=+optspace3
+STCLOCALOPTIMIZATIONS=+optspace3
+
+
+# Argument(s) to the stc compiler (stc --usage).
+# -warn : no warnings
+# -warnNonStandard : no warnings about ST/X extensions
+# -warnEOLComments : no warnings about EOL comment extension
+# -warnPrivacy : no warnings about privateClass extension
+# -warnUnused : no warnings about unused variables
+#
+# ********** OPTIONAL: MODIFY the next line(s) ***
+# STCWARNINGS=-warn
+# STCWARNINGS=-warnNonStandard
+# STCWARNINGS=-warnEOLComments
+STCWARNINGS=-warnNonStandard
+
+COMMON_CLASSES= \
+ stx_goodies_regression_testData_packages_p2platform_specific_classes \
+
+UNIX_CLASSES= \
+ UnixSpecificClass \
+
+VMS_CLASSES= \
+ VMSSpecificClass \
+
+WIN32_CLASSES= \
+ Win32SpecificClass \
+
+
+
+
+COMMON_OBJS= \
+ $(OUTDIR)stx_goodies_regression_testData_packages_p2platform_specific_classes.$(O) \
+
+UNIX_OBJS= \
+ $(OUTDIR)UnixSpecificClass.$(O) \
+
+VMS_OBJS= \
+ $(OUTDIR)VMSSpecificClass.$(O) \
+
+WIN32_OBJS= \
+ $(OUTDIR)Win32SpecificClass.$(O) \
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/packages/p2platform_specific_classes/Makefile.init Mon Jul 24 21:21:01 2017 +0200
@@ -0,0 +1,27 @@
+#
+# DO NOT EDIT
+#
+# make uses this file (Makefile) only, if there is no
+# file named "makefile" (lower-case m) in the same directory.
+# My only task is to generate the real makefile and call make again.
+# Thereafter, I am no longer used and needed.
+#
+# MACOSX caveat:
+# as filenames are not case sensitive (in a default setup),
+# we cannot use the above trick. Therefore, this file is now named
+# "Makefile.init", and you have to execute "make -f Makefile.init" to
+# get the initial makefile. This is now also done by the toplevel CONFIG
+# script.
+
+.PHONY: run
+
+run: makefile
+ $(MAKE) -f makefile
+
+#only needed for the definition of $(TOP)
+include Make.proto
+
+makefile: mf
+
+mf:
+ $(TOP)/rules/stmkmf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/packages/p2platform_specific_classes/UnixSpecificClass.st Mon Jul 24 21:21:01 2017 +0200
@@ -0,0 +1,11 @@
+"{ Package: 'stx:goodies/regression/testData/packages/p2platform_specific_classes' }"
+
+"{ NameSpace: Smalltalk }"
+
+Object subclass:#UnixSpecificClass
+ instanceVariableNames:''
+ classVariableNames:''
+ poolDictionaries:''
+ category:'* Projects & Packages *'
+!
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/packages/p2platform_specific_classes/VMSSpecificClass.st Mon Jul 24 21:21:01 2017 +0200
@@ -0,0 +1,11 @@
+"{ Package: 'stx:goodies/regression/testData/packages/p2platform_specific_classes' }"
+
+"{ NameSpace: Smalltalk }"
+
+Object subclass:#VMSSpecificClass
+ instanceVariableNames:''
+ classVariableNames:''
+ poolDictionaries:''
+ category:'* Projects & Packages *'
+!
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/packages/p2platform_specific_classes/Win32SpecificClass.st Mon Jul 24 21:21:01 2017 +0200
@@ -0,0 +1,19 @@
+"{ Package: 'stx:goodies/regression/testData/packages/p2platform_specific_classes' }"
+
+"{ NameSpace: Smalltalk }"
+
+Object subclass:#Win32SpecificClass
+ instanceVariableNames:''
+ classVariableNames:''
+ poolDictionaries:''
+ category:'* Projects & Packages *'
+!
+
+
+!Win32SpecificClass class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/packages/p2platform_specific_classes/abbrev.stc Mon Jul 24 21:21:01 2017 +0200
@@ -0,0 +1,7 @@
+# automagically generated by the project definition
+# this file is needed for stc to be able to compile modules independently.
+# it provides information about a classes filename, category and especially namespace.
+UnixSpecificClass UnixSpecificClass stx:goodies/regression/testData/packages/p2platform_specific_classes '* Projects & Packages *' 0
+VMSSpecificClass VMSSpecificClass stx:goodies/regression/testData/packages/p2platform_specific_classes '* Projects & Packages *' 0
+Win32SpecificClass Win32SpecificClass stx:goodies/regression/testData/packages/p2platform_specific_classes '* Projects & Packages *' 0
+stx_goodies_regression_testData_packages_p2platform_specific_classes stx_goodies_regression_testData_packages_p2platform_specific_classes stx:goodies/regression/testData/packages/p2platform_specific_classes '* Projects & Packages *' 3
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/packages/p2platform_specific_classes/bc.mak Mon Jul 24 21:21:01 2017 +0200
@@ -0,0 +1,83 @@
+# $Header$
+#
+# DO NOT EDIT
+# automagically generated from the projectDefinition: stx_goodies_regression_testData_packages_p2platform_specific_classes.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# Notice, that the name bc.mak is historical (from times, when only borland c was supported).
+# This file contains make rules for the win32 platform using either borland-bcc or visual-c.
+# It shares common definitions with the unix-make in Make.spec.
+# The bc.mak supports the following targets:
+# bmake - compile all st-files to a classLib (dll)
+# bmake clean - clean all temp files
+# bmake clobber - clean all
+#
+# Historic Note:
+# this used to contain only rules to make with borland
+# (called via bmake, by "make.exe -f bc.mak")
+# this has changed; it is now also possible to build using microsoft visual c
+# (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
+#
+TOP=..\..\..\..\..
+INCLUDE_TOP=$(TOP)\..
+
+
+
+!INCLUDE $(TOP)\rules\stdHeader_bc
+
+!INCLUDE Make.spec
+
+LIBNAME=libstx_goodies_regression_testData_packages_p2platform_specific_classes
+MODULE_PATH=goodies\regression\testData\packages\p2platform_specific_classes
+RESFILES=stx_goodies_regression_testData_packages_p2platform_specific_classesWINrc.$(RES)
+
+
+
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic
+LOCALDEFINES=
+
+STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
+LOCALLIBS=
+
+OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
+
+ALL:: classLibRule
+
+classLibRule: $(OUTDIR) $(OUTDIR)$(LIBNAME).dll
+
+!INCLUDE $(TOP)\rules\stdRules_bc
+
+# build all mandatory prerequisite packages (containing superclasses) for this package
+prereq:
+ pushd ..\..\..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+
+
+
+
+
+
+test: $(TOP)\goodies\builder\reports\NUL
+ pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
+ $(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
+
+clean::
+ -del *.$(CSUFFIX)
+
+
+# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)stx_goodies_regression_testData_packages_p2platform_specific_classes.$(O) stx_goodies_regression_testData_packages_p2platform_specific_classes.$(C) stx_goodies_regression_testData_packages_p2platform_specific_classes.$(H): stx_goodies_regression_testData_packages_p2platform_specific_classes.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
+$(OUTDIR)Win32SpecificClass.$(O) Win32SpecificClass.$(C) Win32SpecificClass.$(H): Win32SpecificClass.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+
+# ENDMAKEDEPEND --- do not remove this line
+
+# **Must be at end**
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+!IFDEF HGROOT
+$(OUTDIR)stx_goodies_regression_testData_packages_p2platform_specific_classes.$(O): $(HGROOT)\.hg\dirstate
+!ENDIF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/packages/p2platform_specific_classes/bmake.bat Mon Jul 24 21:21:01 2017 +0200
@@ -0,0 +1,15 @@
+@REM -------
+@REM make using Borland bcc32
+@REM type bmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+@SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
+make.exe -N -f bc.mak %DEFINES% %*
+
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/packages/p2platform_specific_classes/libInit.cc Mon Jul 24 21:21:01 2017 +0200
@@ -0,0 +1,56 @@
+/*
+ * $Header$
+ *
+ * DO NOT EDIT
+ * automagically generated from the projectDefinition: stx_goodies_regression_testData_packages_p2platform_specific_classes.
+ */
+#define __INDIRECTVMINITCALLS__
+#include <stc.h>
+
+#ifdef WIN32
+# pragma codeseg INITCODE "INITCODE"
+#endif
+
+#if defined(INIT_TEXT_SECTION) || defined(DLL_EXPORT)
+DLL_EXPORT void _libstx_goodies_regression_testData_packages_p2platform_specific_classes_Init() INIT_TEXT_SECTION;
+DLL_EXPORT void _libstx_goodies_regression_testData_packages_p2platform_specific_classes_InitDefinition() INIT_TEXT_SECTION;
+#endif
+
+extern void _stx_137goodies_137regression_137testData_137packages_137p2platform_137specific_137classes_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+#ifdef UNIX
+extern void _UnixSpecificClass_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+#endif /* UNIX */
+#ifdef WIN32
+extern void _Win32SpecificClass_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+#endif /* WIN32 */
+#ifdef VMS
+extern void _VMSSpecificClass_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+#endif /* VMS */
+
+
+
+void _libstx_goodies_regression_testData_packages_p2platform_specific_classes_InitDefinition(int pass, struct __vmData__ *__pRT__, OBJ snd)
+{
+ __BEGIN_PACKAGE2__("libstx_goodies_regression_testData_packages_p2platform_specific_classes__DFN", _libstx_goodies_regression_testData_packages_p2platform_specific_classes_InitDefinition, "stx:goodies/regression/testData/packages/p2platform_specific_classes");
+ _stx_137goodies_137regression_137testData_137packages_137p2platform_137specific_137classes_Init(pass,__pRT__,snd);
+
+ __END_PACKAGE__();
+}
+
+void _libstx_goodies_regression_testData_packages_p2platform_specific_classes_Init(int pass, struct __vmData__ *__pRT__, OBJ snd)
+{
+ __BEGIN_PACKAGE2__("libstx_goodies_regression_testData_packages_p2platform_specific_classes", _libstx_goodies_regression_testData_packages_p2platform_specific_classes_Init, "stx:goodies/regression/testData/packages/p2platform_specific_classes");
+ _stx_137goodies_137regression_137testData_137packages_137p2platform_137specific_137classes_Init(pass,__pRT__,snd);
+#ifdef UNIX
+ _UnixSpecificClass_Init(pass,__pRT__,snd);
+#endif /* UNIX */
+#ifdef WIN32
+ _Win32SpecificClass_Init(pass,__pRT__,snd);
+#endif /* WIN32 */
+#ifdef VMS
+ _VMSSpecificClass_Init(pass,__pRT__,snd);
+#endif /* VMS */
+
+
+ __END_PACKAGE__();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/packages/p2platform_specific_classes/mingwmake.bat Mon Jul 24 21:21:01 2017 +0200
@@ -0,0 +1,18 @@
+@REM -------
+@REM make using mingw gnu compiler
+@REM type mingwmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+@SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
+@pushd ..\..\..\..\..\rules
+@call find_mingw.bat
+@popd
+make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
+
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/packages/p2platform_specific_classes/stx_goodies_regression_testData_packages_p2platform_specific_classes.st Mon Jul 24 21:21:01 2017 +0200
@@ -0,0 +1,130 @@
+"{ Package: 'stx:goodies/regression/testData/packages/p2platform_specific_classes' }"
+
+"{ NameSpace: Smalltalk }"
+
+LibraryDefinition subclass:#stx_goodies_regression_testData_packages_p2platform_specific_classes
+ instanceVariableNames:''
+ classVariableNames:''
+ poolDictionaries:''
+ category:'* Projects & Packages *'
+!
+
+
+!stx_goodies_regression_testData_packages_p2platform_specific_classes class methodsFor:'description'!
+
+excludedFromPreRequisites
+ "obsolete; temporarily, this is still called for, but will eventually vanish.
+
+ List packages which are to be explicitely excluded from the automatic constructed
+ prerequisites lists (both).
+ If empty, everything that is found along the inheritance of any of
+ my classes is considered to be a prerequisite package."
+
+ ^ #(
+ )
+!
+
+mandatoryPreRequisites
+ "list packages which are mandatory as a prerequisite.
+ This are packages containing superclasses of my classes and classes which
+ are extended by myself.
+ They are mandatory, because we need these packages as a prerequisite for loading and compiling.
+ This method is generated automatically,
+ by searching along the inheritance chain of all of my classes.
+ Please take a look at the #referencedPreRequisites method as well."
+
+ ^ #(
+ #'stx:libbasic' "LibraryDefinition - superclass of stx_goodies_regression_testData_packages_p2platform_specific_classes"
+ )
+!
+
+referencedPreRequisites
+ "list packages which are a prerequisite, because they contain
+ classes which are referenced by my classes.
+ These packages are NOT needed as a prerequisite for compiling or loading,
+ however, a class from it may be referenced during execution and having it
+ unloaded then may lead to a runtime doesNotUnderstand error, unless the caller
+ includes explicit checks for the package being present.
+ This method is generated automatically,
+ by searching all classes (and their packages) which are referenced by my classes.
+ Please also take a look at the #mandatoryPreRequisites method"
+
+ ^ #(
+ )
+!
+
+subProjects
+ "list packages which are known as subprojects.
+ The generated makefile will enter those and make there as well.
+ However: they are not forced to be loaded when a package is loaded;
+ for those, redefine #referencedPrerequisites or #mandatoryPreRequisites."
+
+ ^ #(
+ )
+! !
+
+!stx_goodies_regression_testData_packages_p2platform_specific_classes class methodsFor:'description - contents'!
+
+classNamesAndAttributes
+ "lists the classes which are to be included in the project.
+ Each entry in the list may be: a single class-name (symbol),
+ or an array-literal consisting of class name and attributes.
+ Attributes are: #autoload or #<os> where os is one of win32, unix,..."
+
+ ^ #(
+ "<className> or (<className> attributes...) in load order"
+ (UnixSpecificClass unix)
+ (VMSSpecificClass vms)
+ (Win32SpecificClass win32)
+ #'stx_goodies_regression_testData_packages_p2platform_specific_classes'
+ )
+!
+
+extensionMethodNames
+ "lists the extension methods which are to be included in the project.
+ Entries are 2-element array literals, consisting of class-name and selector.
+ A correponding method with real names must be present in my concrete subclasses
+ if it has extensions."
+
+ ^ #(
+ )
+! !
+
+!stx_goodies_regression_testData_packages_p2platform_specific_classes class methodsFor:'description - project information'!
+
+companyName
+ "Returns a company string which will appear in <lib>.rc.
+ Under win32, this is placed into the dll's file-info.
+ Other systems may put it elsewhere, or ignore it."
+
+ ^ 'Claus Gittinger & eXept Software AG'
+!
+
+description
+ "Returns a description string which will appear in nt.def / bc.def"
+
+ ^ 'Smalltalk/X Class library'
+!
+
+legalCopyright
+ "Returns a copyright string which will appear in <lib>.rc.
+ Under win32, this is placed into the dll's file-info.
+ Other systems may put it elsewhere, or ignore it."
+
+ ^ 'Copyright Claus Gittinger 2017\nCopyright eXept Software AG 2017'
+!
+
+productName
+ "Returns a product name which will appear in <lib>.rc.
+ Under win32, this is placed into the dll's file-info.
+ This method is usually redefined in a concrete application definition"
+
+ ^ 'Smalltalk/X'
+! !
+
+!stx_goodies_regression_testData_packages_p2platform_specific_classes class methodsFor:'documentation'!
+
+version_HG
+ ^ '$Changeset: <not expanded> $'
+! !
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/packages/p2platform_specific_classes/stx_goodies_regression_testData_packages_p2platform_specific_classesWINrc.rc Mon Jul 24 21:21:01 2017 +0200
@@ -0,0 +1,37 @@
+//
+// DO NOT EDIT
+// automagically generated from the projectDefinition: stx_goodies_regression_testData_packages_p2platform_specific_classes.
+//
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 6,2,32767,32767
+ PRODUCTVERSION 6,2,6,0
+#if (__BORLANDC__)
+ FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
+ FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VS_USER_DEFINED
+#endif
+
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "CompanyName", "Claus Gittinger & eXept Software AG\0"
+ VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
+ VALUE "FileVersion", "6.2.32767.32767\0"
+ VALUE "InternalName", "stx:goodies/regression/testData/packages/p2platform_specific_classes\0"
+ VALUE "LegalCopyright", "Copyright Claus Gittinger 2017\nCopyright eXept Software AG 2017\0"
+ VALUE "ProductName", "Smalltalk/X\0"
+ VALUE "ProductVersion", "6.2.6.0\0"
+ VALUE "ProductDate", "Wed, 26 Jul 2017 21:46:18 GMT\0"
+ END
+
+ END
+
+ BLOCK "VarFileInfo"
+ BEGIN // Language | Translation
+ VALUE "Translation", 0x409, 0x4E4 // U.S. English, Windows Multilingual
+ END
+END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/testData/packages/p2platform_specific_classes/vcmake.bat Mon Jul 24 21:21:01 2017 +0200
@@ -0,0 +1,22 @@
+@REM -------
+@REM make using Microsoft Visual C compiler
+@REM type vcmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+
+@if not defined VSINSTALLDIR (
+ pushd ..\..\..\..\..\rules
+ call vcsetup.bat
+ popd
+)
+@SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
+
+make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
+
+
+
+