--- a/examples/chat/Make.proto Mon Feb 04 00:24:10 2019 +0000
+++ b/examples/chat/Make.proto Thu May 02 23:04:39 2019 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/examples/chat/Make.proto,v 1.2 2015-03-20 12:08:02 vrany Exp $
+# $Header$
#
# automagically generated from the projectDefinition: stx_libjava_examples_chat.
#
@@ -23,7 +23,7 @@
NOAUTOLOAD=1
NOSUBAUTOLOAD=1
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libview2
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/libview2
LOCALDEFINES=
GLOBALDEFINES=
MAIN_DEFINES=-DIGNORE_IMAGE -DNO_DISPLAY
@@ -33,6 +33,7 @@
DELIVERBINARIES=
+APPNAME=libstx_libjava_examples_chat
LIBNAME=libstx_libjava_examples_chat
STCLOCALOPT='-package=$(PACKAGE)' -I. -headerDir=. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=. -varPrefix=$(LIBNAME)
@@ -59,13 +60,14 @@
#
REQUIRED_LIBS= libstx_libbasic \
+ libstx_goodies_regex \
libstx_libbasic2 \
libstx_libcomp \
+ libstx_goodies_refactoryBrowser_parser \
libstx_libbasic3 \
libstx_libview \
libstx_libui \
libstx_libview2 \
- libstx_goodies_sunit \
libstx_libwidg \
libstx_libhtml \
libstx_libwidg2 \
@@ -74,13 +76,14 @@
REQUIRED_LIBOBJS= ../../../libbasic/libstx_libbasic$(O_EXT) \
+ ../../../goodies/regex/libstx_goodies_regex$(O_EXT) \
../../../libbasic2/libstx_libbasic2$(O_EXT) \
../../../libcomp/libstx_libcomp$(O_EXT) \
+ ../../../goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser$(O_EXT) \
../../../libbasic3/libstx_libbasic3$(O_EXT) \
../../../libview/libstx_libview$(O_EXT) \
../../../libui/libstx_libui$(O_EXT) \
../../../libview2/libstx_libview2$(O_EXT) \
- ../../../goodies/sunit/libstx_goodies_sunit$(O_EXT) \
../../../libwidg/libstx_libwidg$(O_EXT) \
../../../libhtml/libstx_libhtml$(O_EXT) \
../../../libwidg2/libstx_libwidg2$(O_EXT) \
@@ -89,13 +92,14 @@
REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \
+ libstx_goodies_regex$(O_EXT) \
libstx_libbasic2$(O_EXT) \
libstx_libcomp$(O_EXT) \
+ libstx_goodies_refactoryBrowser_parser$(O_EXT) \
libstx_libbasic3$(O_EXT) \
libstx_libview$(O_EXT) \
libstx_libui$(O_EXT) \
libstx_libview2$(O_EXT) \
- libstx_goodies_sunit$(O_EXT) \
libstx_libwidg$(O_EXT) \
libstx_libhtml$(O_EXT) \
libstx_libwidg2$(O_EXT) \
@@ -113,9 +117,9 @@
all:: prereq ALL_NP
# like ALL, but not prereqs
-ALL_NP:: exe $(SUBPROJECT_LIBS) $(REQUIRED_SUPPORT_DIRS) $(SETUP_RULE)
+ALL_NP:: exe subProjects $(REQUIRED_SUPPORT_DIRS) $(SETUP_RULE)
-exe: chat
+exe: chat registerApplication
chat: $(APP_DIRS_TO_MAKE) $(APP_LIBOBJS) $(REQUIRED_LIBOBJS) $(OBJS)
$(MAKE) link_chat
@@ -135,50 +139,75 @@
# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
- $(MAKE) FORCE=@@@FORCE-BUILD@@@ $(REQUIRED_LIBOBJS)
+ $(MAKE) FORCE=@@@FORCE-BUILD@@@ makePrereq
+
+makePrereq: $(REQUIRED_LIBOBJS)
+
+subProjects:
+ $(MAKE) FORCE=@@@FORCE-BUILD@@@ makeSubProjects
+
+makeSubProjects: $(SUBPROJECT_LIBS)
+ @echo "sub-projects made"
#
# a self installable delivery
#
+
+#
+# for linux, this uses autopackage
+# (SETUP_RULE is set to setup_linux)
+setup_linux:
+ @if test -d autopackage; then \
+ if which autopackage; then \
+ makepackage; \
+ else \
+ echo "Warning: autopackage not found, installer NOT created"; \
+ fi \
+ else \
+ echo "Error: missing autopackage directory"; \
+ exit 1; \
+ fi
+
# backward compatible fallback
setup::
@if test -d autopackage; then \
- makepackage; \
+ if which autopackage; then \
+ makepackage; \
+ else \
+ echo "Warning: autopackage not found, installer NOT created"; \
+ fi \
else \
echo "Error: make setup not yet available in this unix"; \
exit 1; \
fi
-#
-# for linux, this uses autopackage
-#
-setup_linux:
- @if test -d autopackage; then \
- makepackage; \
- else \
- echo "Error: missing autopackage directory"; \
- exit 1; \
- fi
#
# for mac, a dmg is generated
+# (SETUP_RULE is set to setup_macosx)
#
setup_macosx: "Chat_dmg"
+ -rm "Chat.dmg"
hdiutil create -fs HFSX -layout SPUD "Chat.dmg" -srcfolder "Chat_dmg" -format UDZO -volname "Chat" -quiet
-"Chat_dmg":
+app: "Chat_dmg"
+
+"Chat_dmg": $(SUBPROJECT_LIBS) $(REQUIRED_SUPPORT_DIRS)
@-rm -rf "Chat_dmg"
@-mkdir "Chat_dmg"
@-mkdir "Chat_dmg/Chat.app"
@-mkdir "Chat_dmg/Chat.app/Contents"
@-mkdir "Chat_dmg/Chat.app/Contents/MacOS"
- cp "chat" "Chat_dmg/Chat.app/Contents/MacOS/Chat"
- @-mkdir Chat_dmg/Chat.app/Contents/MacOS/.
+ cp "chat" "Chat_dmg/Chat.app/Contents/MacOS/"
+ @-cp osx/Info.plist "Chat_dmg/Chat.app/Contents/"
+ @-mkdir "Chat_dmg/Chat.app/Contents/MacOS/."
-cp -r *.so "Chat_dmg/Chat.app/Contents/MacOS/."
-cp -r symbols.stc "Chat_dmg/Chat.app/Contents/MacOS/."
-cp -r *.stx "Chat_dmg/Chat.app/Contents/MacOS/."
-cp -r *.rc "Chat_dmg/Chat.app/Contents/MacOS/."
-cp -r resources "Chat_dmg/Chat.app/Contents/MacOS/."
+ @-rm "Chat_dmg/Chat.app/Contents/MacOS/"*WINrc.rc
+
SOURCEFILES: chat_SOURCES \
@@ -273,6 +302,19 @@
../../../libbasic/makefile: ../../../libbasic/Make.proto
$(TOP)/rules/stmkmf --cd ../../../libbasic
+libstx_goodies_regex.so: ../../../goodies/regex/libstx_goodies_regex.so
+ ln -sf ../../../goodies/regex/libstx_goodies_regex.so .
+
+../../../goodies/regex/libstx_goodies_regex.so: ../../../goodies/regex/makefile $(FORCE)
+ @if [ -f "../../../goodies/regex/.NOSOURCE" ]; then \
+ echo "skip make in ../../../goodies/regex (no source)"; \
+ else \
+ cd ../../../goodies/regex && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+ fi
+
+../../../goodies/regex/makefile: ../../../goodies/regex/Make.proto
+ $(TOP)/rules/stmkmf --cd ../../../goodies/regex
+
libstx_libbasic2.so: ../../../libbasic2/libstx_libbasic2.so
ln -sf ../../../libbasic2/libstx_libbasic2.so .
@@ -299,6 +341,19 @@
../../../libcomp/makefile: ../../../libcomp/Make.proto
$(TOP)/rules/stmkmf --cd ../../../libcomp
+libstx_goodies_refactoryBrowser_parser.so: ../../../goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so
+ ln -sf ../../../goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so .
+
+../../../goodies/refactoryBrowser/parser/libstx_goodies_refactoryBrowser_parser.so: ../../../goodies/refactoryBrowser/parser/makefile $(FORCE)
+ @if [ -f "../../../goodies/refactoryBrowser/parser/.NOSOURCE" ]; then \
+ echo "skip make in ../../../goodies/refactoryBrowser/parser (no source)"; \
+ else \
+ cd ../../../goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
+ fi
+
+../../../goodies/refactoryBrowser/parser/makefile: ../../../goodies/refactoryBrowser/parser/Make.proto
+ $(TOP)/rules/stmkmf --cd ../../../goodies/refactoryBrowser/parser
+
libstx_libbasic3.so: ../../../libbasic3/libstx_libbasic3.so
ln -sf ../../../libbasic3/libstx_libbasic3.so .
@@ -351,19 +406,6 @@
../../../libview2/makefile: ../../../libview2/Make.proto
$(TOP)/rules/stmkmf --cd ../../../libview2
-libstx_goodies_sunit.so: ../../../goodies/sunit/libstx_goodies_sunit.so
- ln -sf ../../../goodies/sunit/libstx_goodies_sunit.so .
-
-../../../goodies/sunit/libstx_goodies_sunit.so: ../../../goodies/sunit/makefile $(FORCE)
- @if [ -f "../../../goodies/sunit/.NOSOURCE" ]; then \
- echo "skip make in ../../../goodies/sunit (no source)"; \
- else \
- cd ../../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \
- fi
-
-../../../goodies/sunit/makefile: ../../../goodies/sunit/Make.proto
- $(TOP)/rules/stmkmf --cd ../../../goodies/sunit
-
libstx_libwidg.so: ../../../libwidg/libstx_libwidg.so
ln -sf ../../../libwidg/libstx_libwidg.so .
@@ -433,6 +475,19 @@
+
+java_clean:
+ ant -f java/build.xml clean
+
+clean:: java_clean
+
+
+java_compile:
+ ant -f java/build.xml compile
+
+all:: java_compile
+
+
java: ant
ant:
@@ -471,9 +526,9 @@
-rm -f chat *.img *.sav
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)Chat.$(O) Chat.$(H): Chat.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ChatStart.$(O) ChatStart.$(H): ChatStart.st $(INCLUDE_TOP)/stx/libbasic/StandaloneStartup.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ChatWindow.$(O) ChatWindow.$(H): ChatWindow.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)stx_libjava_examples_chat.$(O) stx_libjava_examples_chat.$(H): stx_libjava_examples_chat.st $(INCLUDE_TOP)/stx/libbasic/ApplicationDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Chat.$(O) Chat.$(C) Chat.$(H): Chat.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)ChatStart.$(O) ChatStart.$(C) ChatStart.$(H): ChatStart.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/StandaloneStartup.$(H) $(STCHDR)
+$(OUTDIR)ChatWindow.$(O) ChatWindow.$(C) ChatWindow.$(H): ChatWindow.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)stx_libjava_examples_chat.$(O) stx_libjava_examples_chat.$(C) stx_libjava_examples_chat.$(H): stx_libjava_examples_chat.st $(INCLUDE_TOP)/stx/libbasic/ApplicationDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/examples/chat/Make.spec Mon Feb 04 00:24:10 2019 +0000
+++ b/examples/chat/Make.spec Thu May 02 23:04:39 2019 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/examples/chat/Make.spec,v 1.2 2015-03-20 12:08:02 vrany Exp $
+# $Header$
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libjava_examples_chat.
@@ -22,7 +22,7 @@
# (if removed, they will be created as common
# -Pxxx : defines the package
# -Zxxx : a prefix for variables within the classLib
-# -Dxxx : defines passed to to CC for inline C-code
+# -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
@@ -42,6 +42,7 @@
# -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
@@ -59,10 +60,10 @@
COMMON_OBJS= \
- $(OUTDIR_SLASH)Chat.$(O) \
- $(OUTDIR_SLASH)ChatStart.$(O) \
- $(OUTDIR_SLASH)ChatWindow.$(O) \
- $(OUTDIR_SLASH)stx_libjava_examples_chat.$(O) \
+ $(OUTDIR)Chat.$(O) \
+ $(OUTDIR)ChatStart.$(O) \
+ $(OUTDIR)ChatWindow.$(O) \
+ $(OUTDIR)stx_libjava_examples_chat.$(O) \
--- a/examples/chat/abbrev.stc Mon Feb 04 00:24:10 2019 +0000
+++ b/examples/chat/abbrev.stc Thu May 02 23:04:39 2019 +0100
@@ -1,7 +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.
-Chat Chat stx:libjava/examples/chat 'stx-libjava-examples-chat' 1
+Chat Chat stx:libjava/examples/chat 'stx-libjava-examples-chat' 2
ChatStart ChatStart stx:libjava/examples/chat 'stx-libjava-examples-chat' 1
-ChatWindow ChatWindow stx:libjava/examples/chat 'stx-libjava-examples-chat' 1
+ChatWindow ChatWindow stx:libjava/examples/chat 'stx-libjava-examples-chat' 2
stx_libjava_examples_chat stx_libjava_examples_chat stx:libjava/examples/chat '* Projects & Packages *' 3
--- a/examples/chat/autopackage/default.apspec Mon Feb 04 00:24:10 2019 +0000
+++ b/examples/chat/autopackage/default.apspec Thu May 02 23:04:39 2019 +0100
@@ -1,9 +1,9 @@
# -*- shell-script -*-
[Meta]
ShortName: chat
-SoftwareVersion: 6.2.3.0
+SoftwareVersion: 8.0.99.0
DisplayName: Very Simple Jabber Client
-RootName: @exept.de/expecco:$SOFTWAREVERSION
+RootName: Chat
Summary: Very Simple Jabber Client
Maintainer: SWING Research Group
Packager: eXept Software AG
@@ -39,18 +39,7 @@
[Imports]
import <<EOF
$source_dir/chat
-$source_dir/resources
-$source_dir/keyboard.rc
-$source_dir/keyboardMacros.rc
-$source_dir/display.rc
-$source_dir/host.rc
-$source_dir/../doc
-$source_dir/../testsuites/webedition
-$source_dir/../projects/libraries
-$source_dir/../reportGenerator/tools
-$source_dir/../../pdf/afm
-$source_dir/../plugin/selenium/libexept_expecco_plugin_selenium.so
-$source_dir/../externalTools
+
EOF
for i in $source_dir/*.so
@@ -66,22 +55,12 @@
find . -type d \( -name CVS -or -name 'not_*' \) -print | xargs rm -rf
mkdir -p $MYPREFIX
-copyFiles expecco *.rc resources $MYPREFIX/bin
-copyFiles *.so $MYPREFIX/lib
-copyFiles doc externalTools $MYPREFIX/packages/exept/expecco
-copyFiles webedition/projects libraries $MYPREFIX/testsuites
-copyFiles tools $MYPREFIX/packages/exept/expecco/reportGenerator
-copyFiles afm $MYPREFIX/packages/exept/pdf
-copyFiles libexept_expecco_plugin_selenium.so $MYPREFIX/plugin
+copyFiles Chat *.rc resources $MYPREFIX/bin
+
-#installExe expecco
+#installExe Chat
#installLib *.so
-#installData resources
-#installData keyboard.rc
-#installData keyboardMacros.rc
-#installData host.rc
-#installData display.rc
-#installData doc
+
[Uninstall]
# Leaving this at the default is safe unless you use custom commands in
--- a/examples/chat/bc.mak Mon Feb 04 00:24:10 2019 +0000
+++ b/examples/chat/bc.mak Thu May 02 23:04:39 2019 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/examples/chat/bc.mak,v 1.2 2015-03-20 12:08:02 vrany Exp $
+# $Header$
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libjava_examples_chat.
@@ -12,6 +12,19 @@
# this has changed; it is now also possible to build using microsoft visual c
# (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
#
+# Rules found here:
+# bmake
+# - build everything, incl. a self installing exe for deployment
+# bmake exe
+# - only build the executable; to be executed and tested here
+# bmake setup
+# - make the self installing exe (assuming that the exe is already present)
+# bmake clean
+# - remove everything that is not needed to execute
+# bmake clobber
+# - remove everything that cannot be reconstructed by bmake
+#
+# For a 64bit build, replace bmake by mingwmake.
TOP=..\..\..
INCLUDE_TOP=$(TOP)\..
@@ -41,9 +54,11 @@
#
-LIBNAME=dummy
+APPNAME=libstx_libjava_examples_chat
+LIBNAME=libstx_libjava_examples_chat
+MODULE_PATH=libjava\examples\chat
STCOPT="+optinline"
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libview2
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\libview2
LOCALDEFINES=
GLOBALDEFINES=
@@ -57,7 +72,7 @@
!ifdef USETCC
RESFILES=
!else
-RESFILES= chatWinRC.$(RES)
+RESFILES= stx_libjava_examples_chatWINrc.$(RES)
!endif
ALLOBJ= $(ALLOBJFILES) $(OBJS)
@@ -66,15 +81,20 @@
LIBFILES=$(LIBDIR_LIBRUN)\librun.lib
ALLLIB=$(LIBFILES) $(APP_IMPORTLIBS) $(APP_RT_LIB)
+!if defined(USEMINGW32)
+RT_DLL=libgcc_s_dw2-1.dll
+!endif
+
REQUIRED_LIBS=librun.dll \
libstx_libbasic.dll \
+ libstx_goodies_regex.dll \
libstx_libbasic2.dll \
libstx_libcomp.dll \
+ libstx_goodies_refactoryBrowser_parser.dll \
libstx_libbasic3.dll \
libstx_libview.dll \
libstx_libui.dll \
libstx_libview2.dll \
- libstx_goodies_sunit.dll \
libstx_libwidg.dll \
libstx_libhtml.dll \
libstx_libwidg2.dll \
@@ -84,6 +104,9 @@
REQUIRED_FILES=$(RT_DLL) $(X11_DLL) $(XEXT_DLL) symbols.stc $(REQUIRED_LIBS)
+SUBPROJECT_LIBS=
+
+
REQUIRED_SUPPORT_DIRS=RESOURCEFILES
target: ALL postBuildCleanup
@@ -92,9 +115,9 @@
ALL:: prereq ALL_NP
# all, but no prereqs
-ALL_NP:: exe $(REQUIRED_SUPPORT_DIRS) postBuildCleanup setup
+ALL_NP:: exe $(REQUIRED_SUPPORT_DIRS) postBuildCleanup subProjects
-exe: newBuildDate $(REQUIRED_LIBS) noConsoleApp consoleApp
+exe: newBuildDate $(REQUIRED_LIBS) noConsoleApp consoleApp registerApplication
# the executable only
# with console
@@ -122,15 +145,35 @@
# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
- $(MAKE) -N -f bc.mak $(USE_ARG) FORCE=FORCE_BUILD $(REQUIRED_LIBS)
+ $(MAKE) -N -f bc.mak $(USE_ARG) FORCE=FORCE_BUILD makePrereq
+
+makePrereq: $(REQUIRED_LIBS)
+
+subProjects:
+ $(MAKE) -N -f bc.mak $(USE_ARG) FORCE=FORCE_BUILD makeSubProjects
+
+makeSubProjects: $(SUBPROJECT_LIBS)
+ @echo "sub-projects made"
FORCE_BUILD:
@rem Dummy target to force a build
# a nullsoft installable delivery
# This uses the Nullsoft Installer Package and works in Windows only
+
+!if defined(USEMINGW64)
+
+setup: $(PROJECT) postBuildCleanup chat.nsi
+ $(MAKENSIS) /DOBJ_DIR=objmingw /DSETUP_NAME=ChatSetup64 chat.nsi
+
+
+!else
+
setup: $(PROJECT) postBuildCleanup chat.nsi
- $(MAKENSIS) chat.nsi
+ $(MAKENSIS) /DOBJ_DIR=objbc /DSETUP_NAME=ChatSetup chat.nsi
+
+
+!endif
newBuildDate:
del buildDate.h
@@ -143,24 +186,24 @@
stx_RESOURCES stx_STYLES stx_BITMAPS
-chat_RESOURCES: resources\stx\libjava\examples\chat\NUL
+chat_RESOURCES: resources\stx\libjava\examples\chat
-copy ..\resources\*.rs resources\stx\libjava\examples\chat\..
-copy ..\resources\*.style resources\stx\libjava\examples\chat\..
-chat_BITMAPS: resources\stx\libjava\examples\chat\bitmaps\NUL
+chat_BITMAPS: resources\stx\libjava\examples\chat\bitmaps
-copy *.ico resources\stx\libjava\examples\chat\bitmaps
-copy *.gif resources\stx\libjava\examples\chat\bitmaps
-resources\stx\libjava\examples\chat\bitmaps\NUL: resources\stx\libjava\examples\chat\NUL
+resources\stx\libjava\examples\chat\bitmaps: resources\stx\libjava\examples\chat
mkdir resources\stx\libjava\examples\chat\bitmaps
-resources\stx\libjava\examples\chat\NUL: resources\stx\libjava\examples\NUL
+resources\stx\libjava\examples\chat: resources\stx\libjava\examples
mkdir resources\stx\libjava\examples\chat
-resources\stx\libjava\examples\NUL: resources\stx\libjava\NUL
+resources\stx\libjava\examples: resources\stx\libjava
mkdir resources\stx\libjava\examples
-resources\stx\libjava\NUL: resources\stx\NUL
+resources\stx\libjava: resources\stx
mkdir resources\stx\libjava
@@ -168,8 +211,7 @@
stx_RESOURCES: \
keyboard.rc \
keyboardMacros.rc \
- host.rc \
- h_win32.rc \
+ host.rc \
display.rc \
d_win32.rc \
libbasic_RESOURCES \
@@ -177,6 +219,7 @@
libtool_RESOURCES \
libtool2_RESOURCES
+
keyboard.rc: $(TOP)\projects\smalltalk\keyboard.rc
copy $(TOP)\projects\smalltalk\keyboard.rc *.*
@@ -186,74 +229,71 @@
host.rc: $(TOP)\projects\smalltalk\host.rc
copy $(TOP)\projects\smalltalk\host.rc *.*
-h_win32.rc: $(TOP)\projects\smalltalk\h_win32.rc
- copy $(TOP)\projects\smalltalk\h_win32.rc *.*
-
display.rc: $(TOP)\projects\smalltalk\display.rc
copy $(TOP)\projects\smalltalk\display.rc *.*
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
- copy $(TOP)\libbasic\resources\*.rs resources\stx\libbasic\*.*
+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
@@ -265,84 +305,90 @@
copy ..\..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll *.*
..\..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll: $(FORCE)
- pushd ..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_goodies_regex.dll: ..\..\..\goodies\regex\$(OBJDIR)\libstx_goodies_regex.dll
+ copy ..\..\..\goodies\regex\$(OBJDIR)\libstx_goodies_regex.dll *.*
+
+..\..\..\goodies\regex\$(OBJDIR)\libstx_goodies_regex.dll: $(FORCE)
+ pushd ..\..\..\goodies\regex & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libbasic2.dll: ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll
copy ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll *.*
..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll: $(FORCE)
- pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libcomp.dll: ..\..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll
copy ..\..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll *.*
..\..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll: $(FORCE)
- pushd ..\..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_goodies_refactoryBrowser_parser.dll: ..\..\..\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll
+ copy ..\..\..\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll *.*
+
+..\..\..\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll: $(FORCE)
+ pushd ..\..\..\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libbasic3.dll: ..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll
copy ..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll *.*
..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll: $(FORCE)
- pushd ..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libview.dll: ..\..\..\libview\$(OBJDIR)\libstx_libview.dll
copy ..\..\..\libview\$(OBJDIR)\libstx_libview.dll *.*
..\..\..\libview\$(OBJDIR)\libstx_libview.dll: $(FORCE)
- pushd ..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libui.dll: ..\..\..\libui\$(OBJDIR)\libstx_libui.dll
copy ..\..\..\libui\$(OBJDIR)\libstx_libui.dll *.*
..\..\..\libui\$(OBJDIR)\libstx_libui.dll: $(FORCE)
- pushd ..\..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libview2.dll: ..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll
copy ..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll *.*
..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll: $(FORCE)
- pushd ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-libstx_goodies_sunit.dll: ..\..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll
- copy ..\..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll *.*
-
-..\..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll: $(FORCE)
- pushd ..\..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libwidg.dll: ..\..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll
copy ..\..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll *.*
..\..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll: $(FORCE)
- pushd ..\..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libhtml.dll: ..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll
copy ..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll *.*
..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll: $(FORCE)
- pushd ..\..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libwidg2.dll: ..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll
copy ..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll *.*
..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll: $(FORCE)
- pushd ..\..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libtool.dll: ..\..\..\libtool\$(OBJDIR)\libstx_libtool.dll
copy ..\..\..\libtool\$(OBJDIR)\libstx_libtool.dll *.*
..\..\..\libtool\$(OBJDIR)\libstx_libtool.dll: $(FORCE)
- pushd ..\..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libjava.dll: ..\..\$(OBJDIR)\libstx_libjava.dll
copy ..\..\$(OBJDIR)\libstx_libjava.dll *.*
..\..\$(OBJDIR)\libstx_libjava.dll: $(FORCE)
- pushd ..\.. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ pushd ..\.. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-sources\NUL:
+sources:
mkdir sources
show:
@@ -431,6 +477,7 @@
librun.dll: $(TOP)\librun\$(OBJDIR_LIBRUN)\librun.dll
copy $(TOP)\librun\$(OBJDIR_LIBRUN)\librun.dll librun.dll
+!ifdef USEBC
#cs3245.dll
$(RT_DLL): $(TOP)\support\win32\borland\$(RT_DLL)
copy $(TOP)\support\win32\borland\$(RT_DLL) $(RT_DLL)
@@ -440,11 +487,30 @@
Xext.dll: $(TOP)\support\win32\Xext.dll
copy $(TOP)\support\win32\Xext.dll Xext.dll
+!endif
+
+!if defined(USEMINGW32)
+$(RT_DLL): $(MINGW_DIR)\bin\$(RT_DLL)
+ -copy $(MINGW_DIR)\bin\$(RT_DLL) $(RT_DLL)
+ -copy $(MINGW_DIR)\bin\libwinpthread-1.dll libwinpthread-1.dll
+!endif
symbols.stc: $(TOP)\include\symbols.stc
copy $(TOP)\include\symbols.stc symbols.stc
+java_clean:
+ ant -f java\build.xml clean
+
+clean:: java_clean
+
+
+java_compile:
+ ant -f java\build.xml compile
+
+ALL:: java_compile
+
+
java: ant
ant:
@@ -498,10 +564,10 @@
@rem stupid win-make does not allow empty
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)Chat.$(O) Chat.$(H): Chat.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)ChatStart.$(O) ChatStart.$(H): ChatStart.st $(INCLUDE_TOP)\stx\libbasic\StandaloneStartup.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)ChatWindow.$(O) ChatWindow.$(H): ChatWindow.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)stx_libjava_examples_chat.$(O) stx_libjava_examples_chat.$(H): stx_libjava_examples_chat.st $(INCLUDE_TOP)\stx\libbasic\ApplicationDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Chat.$(O) Chat.$(C) Chat.$(H): Chat.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)ChatStart.$(O) ChatStart.$(C) ChatStart.$(H): ChatStart.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\StandaloneStartup.$(H) $(STCHDR)
+$(OUTDIR)ChatWindow.$(O) ChatWindow.$(C) ChatWindow.$(H): ChatWindow.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)stx_libjava_examples_chat.$(O) stx_libjava_examples_chat.$(C) stx_libjava_examples_chat.$(H): stx_libjava_examples_chat.st $(INCLUDE_TOP)\stx\libbasic\ApplicationDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/examples/chat/bmake.bat Mon Feb 04 00:24:10 2019 +0000
+++ b/examples/chat/bmake.bat Thu May 02 23:04:39 2019 +0100
@@ -4,9 +4,11 @@
@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% %*
+@IF "%1" EQU "exe" exit /b 0
+@IF "%1" EQU "setup" exit /b 0
+@IF "%1" EQU "pluginSetup" exit /b 0
+
--- a/examples/chat/builder/baseline.rbspec Mon Feb 04 00:24:10 2019 +0000
+++ b/examples/chat/builder/baseline.rbspec Thu May 02 23:04:39 2019 +0100
@@ -15,13 +15,14 @@
# --------
package "stx:libbasic"
+ package "stx:goodies/regex"
package "stx:libbasic2"
package "stx:libcomp"
+ package "stx:goodies/refactoryBrowser/parser"
package "stx:libbasic3"
package "stx:libview"
package "stx:libui"
package "stx:libview2"
- package "stx:goodies/sunit"
package "stx:libwidg"
package "stx:libhtml"
package "stx:libwidg2"
--- a/examples/chat/builder/package.deps.rake Mon Feb 04 00:24:10 2019 +0000
+++ b/examples/chat/builder/package.deps.rake Thu May 02 23:04:39 2019 +0100
@@ -2,6 +2,27 @@
# Package dependencies.
# Automatically generated by project defintion.
+task "stx:goodies/refactoryBrowser/parser" => "stx:libbasic"
+
+task "stx:goodies/regex" => "stx:libbasic"
+
+
+task "stx:libbasic2" => "stx:libbasic"
+
+task "stx:libbasic3" => "stx:libbasic"
+
+task "stx:libcomp" => "stx:libbasic"
+
+task "stx:libhtml" => "stx:libbasic"
+task "stx:libhtml" => "stx:libview"
+task "stx:libhtml" => "stx:libwidg"
+
+task "stx:libjava" => "stx:libbasic"
+task "stx:libjava" => "stx:libbasic2"
+task "stx:libjava" => "stx:libbasic3"
+task "stx:libjava" => "stx:libview"
+
+task "stx:libtool" => "stx:goodies/refactoryBrowser/parser"
task "stx:libtool" => "stx:libbasic"
task "stx:libtool" => "stx:libbasic2"
task "stx:libtool" => "stx:libbasic3"
@@ -11,72 +32,39 @@
task "stx:libtool" => "stx:libview2"
task "stx:libtool" => "stx:libwidg"
task "stx:libtool" => "stx:libwidg2"
-task "stx:libtool" => "stx:libwidg2"
-task "stx:libtool" => "stx:libwidg2"
-task "stx:libtool" => "stx:libwidg2"
+
+task "stx:libui" => "stx:libbasic"
+
+task "stx:libview" => "stx:libbasic"
-task "stx:libcomp" => "stx:libbasic"
+task "stx:libview2" => "stx:libbasic"
+task "stx:libview2" => "stx:libbasic2"
+task "stx:libview2" => "stx:libview"
-task "stx:libbasic3" => "stx:libbasic"
-task "stx:libbasic3" => "stx:libbasic2"
+task "stx:libwidg" => "stx:libbasic"
+task "stx:libwidg" => "stx:libview"
+task "stx:libwidg" => "stx:libview2"
task "stx:libwidg2" => "stx:libbasic"
task "stx:libwidg2" => "stx:libbasic2"
task "stx:libwidg2" => "stx:libview"
task "stx:libwidg2" => "stx:libview2"
task "stx:libwidg2" => "stx:libwidg"
-task "stx:libwidg2" => "stx:libui"
-
-task "stx:libhtml" => "stx:libbasic"
-task "stx:libhtml" => "stx:libview"
-task "stx:libhtml" => "stx:libwidg"
-
-task "stx:libbasic2" => "stx:libbasic"
-task "stx:libview2" => "stx:libbasic"
-task "stx:libview2" => "stx:libbasic2"
-task "stx:libview2" => "stx:libview"
-task "stx:libview2" => "stx:libui"
-
-task "stx:goodies/sunit" => "stx:libbasic"
-task "stx:goodies/sunit" => "stx:libview2"
-task "stx:goodies/sunit" => "stx:libbasic2"
-task "stx:goodies/sunit" => "stx:libview"
-
-task "stx:libjava" => "stx:goodies/sunit"
-task "stx:libjava" => "stx:libbasic"
-task "stx:libjava" => "stx:libbasic2"
-task "stx:libjava" => "stx:libbasic3"
-task "stx:libjava" => "stx:libview"
-task "stx:libjava" => "stx:libcomp"
-task "stx:libjava" => "stx:libhtml"
-task "stx:libjava" => "stx:libtool"
-task "stx:libjava" => "stx:libview2"
-task "stx:libjava" => "stx:libwidg"
-task "stx:libjava" => "stx:libwidg2"
-
-task "stx:libwidg" => "stx:libbasic"
-task "stx:libwidg" => "stx:libview"
-task "stx:libwidg" => "stx:libview2"
-task "stx:libwidg" => "stx:libbasic2"
-task "stx:libwidg" => "stx:libbasic3"
-task "stx:libwidg" => "stx:libui"
-
-task "stx:libui" => "stx:libbasic"
-task "stx:libui" => "stx:libview"
-
-task "stx:libview" => "stx:libbasic"
-task "stx:libview" => "stx:libbasic2"
-
+task "stx:libjava/examples/chat" => "stx:goodies/refactoryBrowser/parser"
+task "stx:libjava/examples/chat" => "stx:goodies/regex"
task "stx:libjava/examples/chat" => "stx:libbasic"
-task "stx:libjava/examples/chat" => "stx:libview2"
task "stx:libjava/examples/chat" => "stx:libbasic2"
+task "stx:libjava/examples/chat" => "stx:libbasic3"
+task "stx:libjava/examples/chat" => "stx:libcomp"
+task "stx:libjava/examples/chat" => "stx:libhtml"
task "stx:libjava/examples/chat" => "stx:libjava"
-task "stx:libjava/examples/chat" => "stx:libcomp"
+task "stx:libjava/examples/chat" => "stx:libtool"
+task "stx:libjava/examples/chat" => "stx:libui"
task "stx:libjava/examples/chat" => "stx:libview"
+task "stx:libjava/examples/chat" => "stx:libview2"
task "stx:libjava/examples/chat" => "stx:libwidg"
task "stx:libjava/examples/chat" => "stx:libwidg2"
-task "stx:libjava/examples/chat" => "stx:libui"
--- a/examples/chat/chat.nsi Mon Feb 04 00:24:10 2019 +0000
+++ b/examples/chat/chat.nsi Thu May 02 23:04:39 2019 +0100
@@ -1,14 +1,21 @@
-; $Header: /cvs/stx/stx/libjava/examples/chat/chat.nsi,v 1.2 2015-03-20 12:08:02 vrany Exp $
+; $Header$
; Script generated by ProjectDefinition.
!define PRODUCT_NAME "Chat"
!define PRODUCT_FILENAME "Chat"
-!define PRODUCT_VERSION "6.2.3.0"
+!define PRODUCT_VERSION "8.0.99.0"
!define PRODUCT_PUBLISHER "eXept Software AG"
!define PRODUCT_WEB_SITE "http://www.exept.de"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_FILENAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+;
+; SETUP_NAME can come from makefile as either setup or setup64
+;
+!if "${SETUP_NAME}" == ""
+SETUP_NAME="ChatSetup"
+!endif
+
!define STX_ROOT "..\..\..\.."
SetCompressor /solid lzma
@@ -59,13 +66,13 @@
VIProductVersion "${PRODUCT_VERSION}.0"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${PRODUCT_NAME}"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "${PRODUCT_PUBLISHER}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "6.2.32767.32767"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "8.0.32767.32767"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${PRODUCT_NAME} Installer"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${PRODUCT_VERSION}"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright Jan Vrany 2013"
-OutFile "ChatSetup.exe"
+OutFile "${SETUP_NAME}.exe"
InstallDir "$PROGRAMFILES\chat"
ShowInstDetails show
ShowUnInstDetails show
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/chat/java/build.auto.xml Thu May 02 23:04:39 2019 +0100
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This file has been generated by STX:LIBJAVA. Do not edit! Edit build.xml instead -->
+<project>
+ <property name="TOP" value="../../../.." />
+ <import file="${TOP}/libjava/java/build.common.xml"/>
+
+ <path id="build.classpath.prereqs">
+ <path refid="build.classpath.prereqs.stx.libjava"/>
+
+ </path>
+
+ <path id="build.classpath.prereqs.stx.libjava">
+ <pathelement path="${TOP}/../stx/libjava/java/bin"/>
+ <fileset dir="${TOP}/../stx/libjava/java/libs" includes="*.jar"/>
+ </path>
+
+
+ <target name="prereqs.stx.libjava" extensionOf="prereqs.main">
+ <ant antfile="${TOP}/../stx/libjava/java/build.xml"
+ target="${ant.project.invoked-targets}"
+ inheritAll="false"
+ useNativeBasedir="true"/>
+ </target>
+
+
+</project>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/chat/java/build.xml Thu May 02 23:04:39 2019 +0100
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project name="stx.libjava.examples.chat" default="compile" basedir=".">
+ <import file="build.auto.xml"/>
+ <!-- Put custom build code here, this file is never overwritten by Smalltalk/X -->
+</project>
--- a/examples/chat/mingwmake.bat Mon Feb 04 00:24:10 2019 +0000
+++ b/examples/chat/mingwmake.bat Thu May 02 23:04:39 2019 +0100
@@ -14,3 +14,9 @@
make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
+@IF "%1" EQU "exe" exit /b 0
+@IF "%1" EQU "setup" exit /b 0
+@IF "%1" EQU "pluginSetup" exit /b 0
+
+
+
--- a/examples/chat/modules.c Mon Feb 04 00:24:10 2019 +0000
+++ b/examples/chat/modules.c Thu May 02 23:04:39 2019 +0100
@@ -1,4 +1,4 @@
-/* $Header: /cvs/stx/stx/libjava/examples/chat/modules.c,v 1.2 2015-03-20 12:08:02 vrany Exp $
+/* $Header$
*
* DO NOT EDIT
* automagically generated from the projectDefinition: stx_libjava_examples_chat.
--- a/examples/chat/modules.stx Mon Feb 04 00:24:10 2019 +0000
+++ b/examples/chat/modules.stx Thu May 02 23:04:39 2019 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/examples/chat/modules.stx,v 1.2 2015-03-20 12:08:02 vrany Exp $
+# $Header$
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libjava_examples_chat.
@@ -16,13 +16,14 @@
# Others might be autoloaded or loaded explicit using "Smalltalk loadPackage:xxx".
#
libstx_libbasic
+libstx_goodies_regex
libstx_libbasic2
libstx_libcomp
+libstx_goodies_refactoryBrowser_parser
libstx_libbasic3
libstx_libview
libstx_libui
libstx_libview2
-libstx_goodies_sunit
libstx_libwidg
libstx_libhtml
libstx_libwidg2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/chat/osx/Info.plist Thu May 02 23:04:39 2019 +0100
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTP PLIST 1.0//EN" "http//www.apple.com/DTDs/ProperyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+<key>CFBundlePackageType</key>
+<string>APPL</string>
+<key>CFBundleExecutable</key>
+<string>chat</string>
+<key>CFBundleShortVersionString</key>
+<string>8.0.32767.32767</string>
+<key>CFBundleName</key>
+<string>chat</string>
+<key>CFBundleInfoDictionaryVersion</key>
+<string>6.0</string>
+<key>LSMinimumSystemVersion</key>
+<string>10.6</string>
+<key>CFBundleIdentifier</key>
+<string>stx.libjava.examples.chat</string>
+<key>CFBundleVersion</key>
+<string>8.0.32767.32767</string>
+</dict>
+</plist>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/chat/stx_libjava_examples_chatWINrc.rc Thu May 02 23:04:39 2019 +0100
@@ -0,0 +1,49 @@
+//
+// DO NOT EDIT
+// automagically generated from the projectDefinition: stx_libjava_examples_chat.
+//
+#define IDR_MAINFRAME 128
+#define IDR_SPLASH 129
+
+#if (__BORLANDC__)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#endif
+
+#pragma code_page(1252)
+
+
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 8,0,32767,32767
+ PRODUCTVERSION 8,0,99,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
+#else
+ FILEFLAGSMASK 0x3fL
+#endif
+
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "CompanyName", "SWING Research Group\0"
+ VALUE "FileDescription", "Very Simple Jabber Client\0"
+ VALUE "FileVersion", "8.0.32767.32767\0"
+ VALUE "InternalName", "stx:libjava/examples/chat\0"
+ VALUE "LegalCopyright", "Copyright Jan Vrany 2013\0"
+ VALUE "ProductName", "Chat\0"
+ VALUE "ProductVersion", "8.0.99.0\0"
+ VALUE "ProductDate", "Thu, 02 May 2019 22:03:41 GMT\0"
+ END
+ END
+
+ BLOCK "VarFileInfo"
+ BEGIN // Language | Translation
+ VALUE "Translation", 0x409, 0x4E4 // U.S. English, Windows Multilingual
+ END
+END
--- a/examples/chat/vcmake.bat Mon Feb 04 00:24:10 2019 +0000
+++ b/examples/chat/vcmake.bat Thu May 02 23:04:39 2019 +0100
@@ -13,8 +13,14 @@
@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% %*
+@IF "%1" EQU "exe" exit /b 0
+@IF "%1" EQU "setup" exit /b 0
+@IF "%1" EQU "pluginSetup" exit /b 0
+