Mercurial Mercurial > hg > stx-projects-smalltalk / 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.
*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Tue, 22 Sep 2009 22:12:42 +0200
changeset 1063 b0ad748f0a18
parent 1062 cdf19bf7159c
child 1064 b9986ee1ff44
*** empty log message ***
bc.mak file | annotate | diff | comparison | revisions
d_win32.rc file | annotate | diff | comparison | revisions
d_win32_visualAge.rc file | annotate | diff | comparison | revisions
keyboard.rc file | annotate | diff | comparison | revisions
stx.vcproj file | annotate | diff | comparison | revisions 
--- a/bc.mak	Tue Sep 22 21:04:15 2009 +0200
+++ b/bc.mak	Tue Sep 22 22:12:42 2009 +0200
@@ -32,13 +32,6 @@
 
 OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
 
-!ifdef USEBC
-OBJDIR=objbc
-!else
-OBJDIR=objvc
-!endif
-
-#
 LIBNAME=dummy
 STCOPT="+optinline"
 LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic
@@ -87,7 +80,7 @@
 
 REQUIRED_SUPPORT_DIRS=RESOURCEFILES
 
-target: exe
+target: $(REQUIRED_FILES) exe
 
 # the executable, all required files and a self-installing-installer-exe
 ALL:: prereq exe setup
@@ -118,32 +111,32 @@
 
 # build all prerequisite packages for this package
 prereq:
-	pushd ..\..\libbasic & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\goodies\refactoryBrowser\helpers & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\goodies\refactoryBrowser\parser & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libbasic2 & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libcomp & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libboss & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libview & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libbasic3 & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libview2 & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\goodies\refactoryBrowser\changes & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libui & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libwidg & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libwidg3 & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libhtml & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libwidg2 & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libtool & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\goodies\refactoryBrowser\refactoring & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\libtool2 & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\librun & bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\goodies\refactoryBrowser\helpers & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\goodies\refactoryBrowser\changes & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libwidg3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\goodies\refactoryBrowser\refactoring & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\libtool2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 
 # a nullsoft installable delivery
 setup: install_smalltalk.exe
 
 newBuildDate:
-    del buildDate.h
+	del buildDate.h
 
 # This uses the Nullsoft Installer Package and works in Windows only
 
@@ -151,8 +144,8 @@
 	$(MAKENSIS) smalltalk.nsi
 
 new:
-	bmake clean
-	bmake
+	$(MAKE_BAT) clean
+	$(MAKE_BAT)
 
 RESOURCEFILES: smalltalk_RESOURCES smalltalk_BITMAPS  \
 	stx_RESOURCES stx_STYLES stx_BITMAPS
@@ -263,7 +256,7 @@
 
 ..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll:
 	cd ..\..\libbasic
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\projects\smalltalk
 
 libstx_goodies_refactoryBrowser_helpers.dll: ..\..\goodies\refactoryBrowser\helpers\$(OBJDIR)\libstx_goodies_refactoryBrowser_helpers.dll
@@ -271,7 +264,7 @@
 
 ..\..\goodies\refactoryBrowser\helpers\$(OBJDIR)\libstx_goodies_refactoryBrowser_helpers.dll:
 	cd ..\..\goodies\refactoryBrowser\helpers
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\..\..\projects\smalltalk
 
 libstx_goodies_refactoryBrowser_parser.dll: ..\..\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll
@@ -279,7 +272,7 @@
 
 ..\..\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll:
 	cd ..\..\goodies\refactoryBrowser\parser
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\..\..\projects\smalltalk
 
 libstx_libbasic2.dll: ..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll
@@ -287,7 +280,7 @@
 
 ..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll:
 	cd ..\..\libbasic2
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\projects\smalltalk
 
 libstx_libcomp.dll: ..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll
@@ -295,7 +288,7 @@
 
 ..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll:
 	cd ..\..\libcomp
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\projects\smalltalk
 
 libstx_libboss.dll: ..\..\libboss\$(OBJDIR)\libstx_libboss.dll
@@ -303,7 +296,7 @@
 
 ..\..\libboss\$(OBJDIR)\libstx_libboss.dll:
 	cd ..\..\libboss
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\projects\smalltalk
 
 libstx_libview.dll: ..\..\libview\$(OBJDIR)\libstx_libview.dll
@@ -311,7 +304,7 @@
 
 ..\..\libview\$(OBJDIR)\libstx_libview.dll:
 	cd ..\..\libview
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\projects\smalltalk
 
 libstx_libbasic3.dll: ..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll
@@ -319,7 +312,7 @@
 
 ..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll:
 	cd ..\..\libbasic3
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\projects\smalltalk
 
 libstx_libview2.dll: ..\..\libview2\$(OBJDIR)\libstx_libview2.dll
@@ -327,7 +320,7 @@
 
 ..\..\libview2\$(OBJDIR)\libstx_libview2.dll:
 	cd ..\..\libview2
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\projects\smalltalk
 
 libstx_goodies_refactoryBrowser_changes.dll: ..\..\goodies\refactoryBrowser\changes\$(OBJDIR)\libstx_goodies_refactoryBrowser_changes.dll
@@ -335,7 +328,7 @@
 
 ..\..\goodies\refactoryBrowser\changes\$(OBJDIR)\libstx_goodies_refactoryBrowser_changes.dll:
 	cd ..\..\goodies\refactoryBrowser\changes
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\..\..\projects\smalltalk
 
 libstx_libui.dll: ..\..\libui\$(OBJDIR)\libstx_libui.dll
@@ -343,7 +336,7 @@
 
 ..\..\libui\$(OBJDIR)\libstx_libui.dll:
 	cd ..\..\libui
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\projects\smalltalk
 
 libstx_libwidg.dll: ..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll
@@ -351,7 +344,7 @@
 
 ..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll:
 	cd ..\..\libwidg
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\projects\smalltalk
 
 libstx_libwidg3.dll: ..\..\libwidg3\$(OBJDIR)\libstx_libwidg3.dll
@@ -359,7 +352,7 @@
 
 ..\..\libwidg3\$(OBJDIR)\libstx_libwidg3.dll:
 	cd ..\..\libwidg3
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\projects\smalltalk
 
 libstx_libhtml.dll: ..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll
@@ -367,7 +360,7 @@
 
 ..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll:
 	cd ..\..\libhtml
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\projects\smalltalk
 
 libstx_libwidg2.dll: ..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll
@@ -375,7 +368,7 @@
 
 ..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll:
 	cd ..\..\libwidg2
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\projects\smalltalk
 
 libstx_libtool.dll: ..\..\libtool\$(OBJDIR)\libstx_libtool.dll
@@ -383,7 +376,7 @@
 
 ..\..\libtool\$(OBJDIR)\libstx_libtool.dll:
 	cd ..\..\libtool
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\projects\smalltalk
 
 libstx_goodies_refactoryBrowser_refactoring.dll: ..\..\goodies\refactoryBrowser\refactoring\$(OBJDIR)\libstx_goodies_refactoryBrowser_refactoring.dll
@@ -391,7 +384,7 @@
 
 ..\..\goodies\refactoryBrowser\refactoring\$(OBJDIR)\libstx_goodies_refactoryBrowser_refactoring.dll:
 	cd ..\..\goodies\refactoryBrowser\refactoring
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\..\..\projects\smalltalk
 
 libstx_libtool2.dll: ..\..\libtool2\$(OBJDIR)\libstx_libtool2.dll
@@ -399,7 +392,7 @@
 
 ..\..\libtool2\$(OBJDIR)\libstx_libtool2.dll:
 	cd ..\..\libtool2
-	bmake "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	$(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	cd ..\projects\smalltalk
 
 
--- a/d_win32.rc	Tue Sep 22 21:04:15 2009 +0200
+++ b/d_win32.rc	Tue Sep 22 22:12:42 2009 +0200
@@ -49,11 +49,12 @@
 "/ map bindValue:#ExecuteKeyboardMacro  to:#CtrlM.
 
 map bindValue:#Help          to:#F1.
+map bindValue:#Rename        to:#F2.
 map bindValue:#Again         to:#F8.
 map bindValue:#FindAgain     to:#F3.   "/ search again in same direction
 map bindValue:#CommentSelection   to:#F4.
 map bindValue:#UncommentSelection to:#F5.
-map bindValue:#CodeCompletion     to:#F2.
+"/ map bindValue:#CodeCompletion     to:#F2.
 
 "/ map bindValue:#Cmdc          to:#Cmdc.
 "/ map bindValue:#Cmdx          to:#Cmdx.
--- a/d_win32_visualAge.rc	Tue Sep 22 21:04:15 2009 +0200
+++ b/d_win32_visualAge.rc	Tue Sep 22 22:12:42 2009 +0200
@@ -54,11 +54,12 @@
 map bindValue:#ExecuteKeyboardMacro  to:#CtrlM.
 
 map bindValue:#Help          to:#F1.
+map bindValue:#Rename        to:#F2.
 map bindValue:#Again         to:#F8.
 map bindValue:#FindAgain     to:#F3.   "/ search again in same direction
 map bindValue:#CommentSelection   to:#F4.
 map bindValue:#UncommentSelection to:#F5.
-map bindValue:#CodeCompletion     to:#F2.
+"/ map bindValue:#CodeCompletion     to:#F2.
 
 "/ map bindValue:#Cmdc          to:#Cmdc.
 "/ map bindValue:#Cmdx          to:#Cmdx.
--- a/keyboard.rc	Tue Sep 22 21:04:15 2009 +0200
+++ b/keyboard.rc	Tue Sep 22 22:12:42 2009 +0200
@@ -354,7 +354,7 @@
 "/ bind function and other keys as:
 "/
 "/ F1            - help
-"/ F2            - completion
+"/ F2            - rename (old: completion)
 "/ F3            - comment-it
 "/ F4            - uncomment-it
 "/ F5            - paste shell output
@@ -381,7 +381,7 @@
 "/ F9      -> macro UndentBy4 (undent by 4)
 "/ F12     -> macro IndentBy1 (indent by 1)
 "/ F11     -> macro UndentBy1 (undent by 1)
-"/ F2      -> completion
+"/ F2      -> rename (old: completion)
 "/ F3      -> commentSelection
 "/ F4      -> uncommentSelection
 
@@ -398,6 +398,7 @@
 map bindValue:#ConvertSelectionToLowercaseOrUppercaseOrUppercaseFirst to:#F6.
 map bindValue:#ConvertSelectionToUppercase to:#CtrlF6.
 
+map bindValue:#Rename           to:#F2.
 map bindValue:#CommentSelection to:#F3.
 map bindValue:#UncommentSelection to:#F4.
 
@@ -407,7 +408,7 @@
 map bindValue:#LearnKeyboardMacro   to:#CtrlF2.
 map bindValue:#ExecuteKeyboardMacro to:#CmdF2.
 
-map bindValue:#CodeCompletion     to:#F2.
+"/ map bindValue:#CodeCompletion     to:#F2.
 map bindValue:#CodeCompletion     to:#'Ctrl '.  "that is Ctrl-Space"
 
 map bindValue:#ExpandAbbreviation to:#'Cmd '.     "that is Alt-Space"
--- a/stx.vcproj	Tue Sep 22 21:04:15 2009 +0200
+++ b/stx.vcproj	Tue Sep 22 22:12:42 2009 +0200
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="stx"
 	ProjectGUID="{9BC03E39-471A-4190-A205-E04C7A3A6E3D}"
 	RootNamespace="smalltalk"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -68,6 +69,8 @@
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -89,9 +92,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -145,6 +145,8 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -166,9 +168,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -225,6 +224,8 @@
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -246,9 +247,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -256,7 +254,6 @@
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{AE48E70A-1CA8-4BB9-B63C-75301911E9CC}"
-			RelativePathToProject=".\librun.vcproj"
 		/>
 	</References>
 	<Files>
hg/stx-projects-smalltalk