--- a/Make.proto Wed Feb 22 12:45:16 2012 +0000
+++ b/Make.proto Thu Mar 29 17:44:54 2012 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libwebkit.
+# automagically generated from the projectDefinition: stx_libwebkit at 2012-03-29 18:45:35.947.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -44,7 +44,7 @@
LOCALDEFINES=
LIBNAME=libstx_libwebkit
-STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -H. -varPrefix=$(LIBNAME)
+STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=. -varPrefix=$(LIBNAME)
# ********** OPTIONAL: MODIFY the next line ***
@@ -63,7 +63,7 @@
all:: preMake classLibRule postMake
-pre_objs:: WebKitRenderer.$(shell uname -m) update-svn-revision
+pre_objs:: WebKitRenderer.$(shell uname -m)
WebKitRenderer.$(shell uname -m): uzbl/uzbl-core
@@ -72,13 +72,32 @@
uzbl/uzbl-core:
$(MAKE) -C uzbl uzbl-core
-update-svn-revision:
- if [ ! -r .svnversion -o "$(shell svnversion -n)" != "$(shell cat .svnversion)" ]; then \
- svnversion -n > .svnversion; \
- sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"'$(shell svnversion -n)'\"\$$\"/g" \
- stx_libwebkit.st; \
+clean::
+ $(MAKE) -C uzbl clean
+ rm WebKitRenderer.$(shell uname -m)
+
+
+
+# Update SVN revision in stx_libbasic3.st
+ifneq (,$(findstring .svn,$(wildcard .svn)))
+.svnversion: *.st
+ if [ -d .svn ]; then \
+ rev=$(shell svnversion -n); \
+ echo -n $$rev > .svnversion; \
+ else \
+ echo -n exported > .svnversion; \
fi
-.PHONY: update-svn-revision
+
+stx_libwebkit.o: stx_libwebkit.st .svnversion
+ if [ -d .svn ]; then \
+ rev2="$(shell printf "%-16s" $$(cat .svnversion))"; \
+ sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"\'$$rev2\'\"\$$\"/g" $< > .stx_libwebkit.svn.st; \
+ fi
+ $(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libwebkit.svn $(O_RULE);
+ mv .stx_libwebkit.svn.$(O) stx_libwebkit.$(O)
+endif
+
+
# add more install actions here
@@ -105,6 +124,7 @@
cleanjunk::
+ -rm -f *.s *.s2
clean::
-rm -f *.o *.H
--- a/Make.spec Wed Feb 22 12:45:16 2012 +0000
+++ b/Make.spec Thu Mar 29 17:44:54 2012 +0000
@@ -1,7 +1,7 @@
# $Header$
#
-# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libwebkit.
+# DO NOT EDIT
+# automagically generated from the projectDefinition: stx_libwebkit at 2012-03-29 18:45:35.879.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -18,7 +18,7 @@
# Argument(s) to the stc compiler (stc --usage).
-# -H. : create header files locally
+# -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
--- a/Makefile Wed Feb 22 12:45:16 2012 +0000
+++ b/Makefile Thu Mar 29 17:44:54 2012 +0000
@@ -1,7 +1,7 @@
#
-# DO NOT EDIT
+# DO NOT EDIT
#
-# make uses this file (Makefile) only, if there is no
+# 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.
@@ -16,4 +16,4 @@
include Make.proto
makefile:
- $(TOP)/rules/stmkmf
+ $(TOP)/rules/stmkmf
--- a/abbrev.stc Wed Feb 22 12:45:16 2012 +0000
+++ b/abbrev.stc Thu Mar 29 17:44:54 2012 +0000
@@ -1,3 +1,6 @@
+# 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.
WebKitRenderer WebKitRenderer stx:libwebkit 'Views-WebKit' 0
WebKitView WebKitView stx:libwebkit 'Views-WebKit' 2
-stx_libwebkit stx_libwebkit stx:libwebkit '* Projects & Packages *' 4
+stx_libwebkit stx_libwebkit stx:libwebkit '* Projects & Packages *' 3
--- a/bc.mak Wed Feb 22 12:45:16 2012 +0000
+++ b/bc.mak Thu Mar 29 17:44:54 2012 +0000
@@ -1,18 +1,24 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libwebkit.
+# automagically generated from the projectDefinition: stx_libwebkit at 2012-03-29 18:45:35.993.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
#
-# This file contains make rules for the win32 platform (using borland-bcc).
+# 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 nt.mak supports the following targets:
+# 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)\..
@@ -31,7 +37,7 @@
LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libbasic
LOCALDEFINES=
-STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
+STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
LOCALLIBS=
OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
@@ -55,6 +61,7 @@
+
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)WebKitRenderer.$(O) WebKitRenderer.$(H): WebKitRenderer.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(STCHDR)
$(OUTDIR)WebKitView.$(O) WebKitView.$(H): WebKitView.st $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/bmake.bat Wed Feb 22 12:45:16 2012 +0000
+++ b/bmake.bat Thu Mar 29 17:44:54 2012 +0000
@@ -3,6 +3,6 @@
@REM type bmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak %1 %2
+make.exe -N -f bc.mak %*
--- a/extensions.st Wed Feb 22 12:45:16 2012 +0000
+++ b/extensions.st Thu Mar 29 17:44:54 2012 +0000
@@ -14,5 +14,5 @@
!stx_libwebkit class methodsFor:'documentation'!
extensionsVersion_SVN
- ^ '$Id$'
+ ^ '$Id:: $'
! !
\ No newline at end of file
--- a/libwebkit.rc Wed Feb 22 12:45:16 2012 +0000
+++ b/libwebkit.rc Thu Mar 29 17:44:54 2012 +0000
@@ -1,15 +1,17 @@
//
-// DO NOT EDIT
+// DO NOT EDIT
// automagically generated from the projectDefinition: stx_libwebkit.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,1,0,0
- PRODUCTVERSION 6,1,2,1
+ FILEVERSION 6,2,0,1
+ PRODUCTVERSION 6,2,1,1
+#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"
@@ -18,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
- VALUE "FileVersion", "6.1.0.0\0"
+ VALUE "FileVersion", "6.2.0.1\0"
VALUE "InternalName", "stx:libwebkit\0"
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
VALUE "ProductName", "Smalltalk/X\0"
- VALUE "ProductVersion", "6.1.2.1\0"
- VALUE "ProductDate", "Sat, 11 Jun 2011 09:25:39 GMT\0"
+ VALUE "ProductVersion", "6.2.1.1\0"
+ VALUE "ProductDate", "Thu, 29 Mar 2012 17:45:36 GMT\0"
END
END
--- a/stx_libwebkit.st Wed Feb 22 12:45:16 2012 +0000
+++ b/stx_libwebkit.st Thu Mar 29 17:44:54 2012 +0000
@@ -129,16 +129,17 @@
svnRepositoryUrlString
"Return a SVN repository URL of myself.
(Generated since 2011-04-08)
+ Do not make the string shorter!!!!!! We have to use fixed-length keyword!!!!!!
"
- ^ '$URL$'
+ ^ '$URL:: $'
!
svnRevisionNr
"Return a SVN revision number of myself.
This number is updated after a commit"
- ^ "$SVN-Revision:"'22M'"$"
+ ^ "$SVN-Revision:"'nil '"$"
! !
!stx_libwebkit class methodsFor:'documentation'!
--- a/vcmake.bat Wed Feb 22 12:45:16 2012 +0000
+++ b/vcmake.bat Thu Mar 29 17:44:54 2012 +0000
@@ -3,6 +3,10 @@
@REM type vcmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak -DUSEVC %1 %2
+
+@if not defined VSINSTALLDIR (
+ call "C:\Program Files\Microsoft Visual Studio 10.0"\VC\bin\vcvars32.bat
+)
+make.exe -N -f bc.mak -DUSEVC %*