Mercurial Mercurial > hg > jv-cface / 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.
(none)
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 18 Jul 2011 16:13:22 +0000
changeset 18 2f55519f3d0b
parent 17 509b9e5d52b2
child 19 1297bf936bfb
(none)
Cface__CBuiltinNode.st file | annotate | diff | comparison | revisions
Cface__CConstNode.st file | annotate | diff | comparison | revisions
Cface__CEnumNode.st file | annotate | diff | comparison | revisions
Cface__CFunctionTypeNode.st file | annotate | diff | comparison | revisions
Cface__CLongNode.st file | annotate | diff | comparison | revisions
Cface__CNode.st file | annotate | diff | comparison | revisions
Cface__CPointerNode.st file | annotate | diff | comparison | revisions
Cface__CStructuredNode.st file | annotate | diff | comparison | revisions
Cface__CTypeNode.st file | annotate | diff | comparison | revisions
Cface__CUnsignedNode.st file | annotate | diff | comparison | revisions
Make.proto file | annotate | diff | comparison | revisions
Make.spec file | annotate | diff | comparison | revisions
Makefile file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
cface.rc file | annotate | diff | comparison | revisions
cvut_fel_cface.st file | annotate | diff | comparison | revisions
extensions.st file | annotate | diff | comparison | revisions
libInit.cc file | annotate | diff | comparison | revisions
vcmake.bat file | annotate | diff | comparison | revisions 
--- a/Cface__CBuiltinNode.st	Mon Jul 18 15:31:42 2011 +0000
+++ b/Cface__CBuiltinNode.st	Mon Jul 18 16:13:22 2011 +0000
@@ -18,6 +18,13 @@
     ^ self shouldImplement
 !
 
+ffiPointerTypeSymbol
+
+    ^ (self ffiTypeSymbol , 'Pointer') asSymbol
+
+    "Created: / 18-07-2011 / 16:40:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 ffiTypeSymbol
     "superclass Cface::CTypeNode says that I am responsible to implement this method"
 
@@ -38,6 +45,16 @@
     "Created: / 12-02-2008 / 22:05:16 / janfrog"
 ! !
 
+!CBuiltinNode methodsFor:'printing'!
+
+printOn: stream indent: level
+
+    stream next: level put: Character tab.
+    stream nextPutAll: self ffiTypeSymbol.
+
+    "Created: / 18-07-2011 / 16:51:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !CBuiltinNode methodsFor:'visiting'!
 
 acceptVisitor:aVisitor 
--- a/Cface__CConstNode.st	Mon Jul 18 15:31:42 2011 +0000
+++ b/Cface__CConstNode.st	Mon Jul 18 16:13:22 2011 +0000
@@ -44,6 +44,13 @@
 
 !CConstNode methodsFor:'accessing'!
 
+ffiPointerTypeSymbol
+
+    ^type ffiPointerTypeSymbol
+
+    "Created: / 18-07-2011 / 16:46:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 ffiTypeSymbol
 
     ^type ffiTypeSymbol
--- a/Cface__CEnumNode.st	Mon Jul 18 15:31:42 2011 +0000
+++ b/Cface__CEnumNode.st	Mon Jul 18 16:13:22 2011 +0000
@@ -45,6 +45,14 @@
     "Created: / 09-07-2008 / 19:38:49 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
+ffiPointerTypeSymbol
+
+    ^#intPointer
+
+    "Created: / 03-07-2008 / 22:54:39 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Created: / 18-07-2011 / 16:56:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 ffiTypeSymbol
     "Superclass Cface::CTypeNode says that I am responsible to implement this method"
     
--- a/Cface__CFunctionTypeNode.st	Mon Jul 18 15:31:42 2011 +0000
+++ b/Cface__CFunctionTypeNode.st	Mon Jul 18 16:13:22 2011 +0000
@@ -10,6 +10,15 @@
 !
 
 
+!CFunctionTypeNode methodsFor:'* As yet uncategorized *'!
+
+ffiPointerTypeSymbol
+
+    ^#pointer
+
+    "Created: / 18-07-2011 / 16:58:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !CFunctionTypeNode methodsFor:'accessing'!
 
 arguments
--- a/Cface__CLongNode.st	Mon Jul 18 15:31:42 2011 +0000
+++ b/Cface__CLongNode.st	Mon Jul 18 16:13:22 2011 +0000
@@ -25,6 +25,13 @@
     "Created: / 09-07-2008 / 19:43:11 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
+ffiPointerTypeSymbol
+
+    ^ (self ffiTypeSymbol , 'Pointer') asSymbol
+
+    "Created: / 18-07-2011 / 16:59:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 ffiTypeSymbol
     "superclass Cface::CModifierNode says that I am responsible to implement this method"
 
--- a/Cface__CNode.st	Mon Jul 18 15:31:42 2011 +0000
+++ b/Cface__CNode.st	Mon Jul 18 16:13:22 2011 +0000
@@ -153,8 +153,6 @@
 
 isCPointerNode
     ^ false
-
-    "Created: / 17-02-2008 / 21:52:45 / janfrog"
 !
 
 isCPointerToCStructure
--- a/Cface__CPointerNode.st	Mon Jul 18 15:31:42 2011 +0000
+++ b/Cface__CPointerNode.st	Mon Jul 18 16:13:22 2011 +0000
@@ -56,14 +56,9 @@
 
 ffiTypeSymbol
 
-    | clsName |
-
-    ^type isCStructuredNode ifTrue:[
-        clsName := type smalltalkClassNameWithNamespace.
-        clsName isNil ifTrue:[#pointer] ifFalse:[clsName].
-    ] ifFalse:[
-        (type ffiTypeSymbol , 'Pointer') asSymbol
-    ]
+    ^type isCPointerNode 
+        ifTrue:[#pointer]
+        ifFalse:[type ffiPointerTypeSymbol]
 
     "Created: / 12-07-2011 / 16:23:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -76,6 +71,26 @@
     type := aCTypeNode.
 ! !
 
+!CPointerNode methodsFor:'printing'!
+
+printOn: stream indent: level
+
+    stream next: level put: Character tab.
+    stream nextPutAll:'(pointer-to '.
+    type printOn: stream indent: 0.
+    stream nextPut:$)
+
+    "Created: / 17-02-2008 / 18:10:30 / janfrog"
+    "Modified: / 10-07-2008 / 20:05:18 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Created: / 18-07-2011 / 16:49:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!CPointerNode methodsFor:'testing'!
+
+isCPointerNode
+    ^ true
+! !
+
 !CPointerNode methodsFor:'visiting'!
 
 acceptVisitor:aVisitor 
--- a/Cface__CStructuredNode.st	Mon Jul 18 15:31:42 2011 +0000
+++ b/Cface__CStructuredNode.st	Mon Jul 18 16:13:22 2011 +0000
@@ -24,10 +24,22 @@
     "Created: / 09-09-2008 / 16:49:58 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
+ffiPointerTypeSymbol
+
+    ^smalltalkName notNil ifTrue:[
+        self smalltalkClassNameWithNamespace
+    ] ifFalse:[
+        #pointer
+    ]
+
+    "Created: / 18-07-2011 / 16:44:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 ffiTypeSymbol
-    "superclass Cface::CTypeNode says that I am responsible to implement this method"
 
-    ^ self shouldImplement
+    ^ self shouldNotImplement
+
+    "Modified: / 18-07-2011 / 16:42:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 fields
--- a/Cface__CTypeNode.st	Mon Jul 18 15:31:42 2011 +0000
+++ b/Cface__CTypeNode.st	Mon Jul 18 16:13:22 2011 +0000
@@ -19,10 +19,23 @@
     "Created: / 09-07-2008 / 19:26:51 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
+ffiPointerTypeSymbol
+
+    ^#pointer
+
+    "Created: / 03-07-2008 / 22:54:39 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Created: / 18-07-2011 / 16:33:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 ffiTypeSymbol
+
+    "Returns ffi type symbol as used by Smalltalk/X FFI bindings
+     (see ExternalLibraryFunction>>invokeFFIwithArguments: forCPPInstance:"    
+
     ^ self subclassResponsibility
 
     "Created: / 03-07-2008 / 22:54:39 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified (comment): / 18-07-2011 / 16:34:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 priority
--- a/Cface__CUnsignedNode.st	Mon Jul 18 15:31:42 2011 +0000
+++ b/Cface__CUnsignedNode.st	Mon Jul 18 16:13:22 2011 +0000
@@ -10,6 +10,15 @@
 !
 
 
+!CUnsignedNode methodsFor:'* As yet uncategorized *'!
+
+ffiPointerTypeSymbol
+
+    ^type ffiPointerTypeSymbol
+
+    "Created: / 18-07-2011 / 17:01:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !CUnsignedNode methodsFor:'accessing'!
 
 ffiTypeSymbol
--- a/Make.proto	Mon Jul 18 15:31:42 2011 +0000
+++ b/Make.proto	Mon Jul 18 16:13:22 2011 +0000
@@ -63,10 +63,17 @@
 
 all:: preMake classLibRule postMake
 
-pre_objs::  
+pre_objs::  update-svn-revision
 
 
 
+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" \
+			cvut_fel_cface.st; \
+	fi
+.PHONY: update-svn-revision
 
 
 # add more install actions here
@@ -86,18 +93,15 @@
 	cd $(TOP)/goodies/refactoryBrowser/helpers && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd $(TOP)/libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/goodies/refactoryBrowser/changes && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd $(TOP)/libwidg3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd $(TOP)/libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd $(TOP)/goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/goodies/smaCC && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
@@ -160,7 +164,7 @@
 $(OUTDIR)Cface__CWCharNode.$(O) Cface__CWCharNode.$(H): Cface__CWCharNode.st $(INCLUDE_TOP)/cvut/fel/cface/Cface__CBuiltinNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CTypeNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Cface__CStructNode.$(O) Cface__CStructNode.$(H): Cface__CStructNode.st $(INCLUDE_TOP)/cvut/fel/cface/Cface__CStructuredNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CDerivedTypeNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CTypeNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Cface__CUnionNode.$(O) Cface__CUnionNode.$(H): Cface__CUnionNode.st $(INCLUDE_TOP)/cvut/fel/cface/Cface__CStructuredNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CDerivedTypeNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CTypeNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic3/ChangeSet.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic3/ClassDefinitionChange.$(H) $(INCLUDE_TOP)/stx/libbasic3/ClassChange.$(H) $(INCLUDE_TOP)/stx/libbasic3/Change.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic3/ClassDefinitionChange.$(H) $(INCLUDE_TOP)/stx/libbasic3/ClassChange.$(H) $(INCLUDE_TOP)/stx/libbasic3/Change.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 
--- a/Make.spec	Mon Jul 18 15:31:42 2011 +0000
+++ b/Make.spec	Mon Jul 18 16:13:22 2011 +0000
@@ -1,6 +1,6 @@
 # $Header$
 #
-# DO NOT EDIT 
+# DO NOT EDIT
 # automagically generated from the projectDefinition: cvut_fel_cface.
 #
 # Warning: once you modify this file, do not rerun
--- a/Makefile	Mon Jul 18 15:31:42 2011 +0000
+++ b/Makefile	Mon Jul 18 16:13:22 2011 +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/bc.mak	Mon Jul 18 15:31:42 2011 +0000
+++ b/bc.mak	Mon Jul 18 16:13:22 2011 +0000
@@ -48,18 +48,15 @@
 	pushd ..\..\..\stx\goodies\refactoryBrowser\helpers & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\stx\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\goodies\refactoryBrowser\changes & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\..\stx\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\stx\libwidg3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\stx\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\stx\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\goodies\smaCC & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
@@ -114,6 +111,6 @@
 $(OUTDIR)Cface__CWCharNode.$(O) Cface__CWCharNode.$(H): Cface__CWCharNode.st $(INCLUDE_TOP)\cvut\fel\cface\Cface__CBuiltinNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CTypeNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Cface__CStructNode.$(O) Cface__CStructNode.$(H): Cface__CStructNode.st $(INCLUDE_TOP)\cvut\fel\cface\Cface__CStructuredNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CDerivedTypeNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CTypeNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Cface__CUnionNode.$(O) Cface__CUnionNode.$(H): Cface__CUnionNode.st $(INCLUDE_TOP)\cvut\fel\cface\Cface__CStructuredNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CDerivedTypeNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CTypeNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic3\ChangeSet.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic3\ClassDefinitionChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\ClassChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic3\ClassDefinitionChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\ClassChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
--- a/cface.rc	Mon Jul 18 15:31:42 2011 +0000
+++ b/cface.rc	Mon Jul 18 16:13:22 2011 +0000
@@ -1,10 +1,10 @@
 //
-// DO NOT EDIT 
+// DO NOT EDIT
 // automagically generated from the projectDefinition: cvut_fel_cface.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     5,4,14,14
-  PRODUCTVERSION  5,4,6,1
+  FILEVERSION     6,2,17,17
+  PRODUCTVERSION  6,2,1,1
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
   FILEFLAGS       VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
   FILEOS          VOS_NT_WINDOWS32
@@ -18,12 +18,12 @@
     BEGIN
       VALUE "CompanyName", "CVUT FEL\0"
       VALUE "FileDescription", "Cairo graphics binding (LIB)\0"
-      VALUE "FileVersion", "5.4.14.14\0"
+      VALUE "FileVersion", "6.2.17.17\0"
       VALUE "InternalName", "cvut:fel/cface\0"
       VALUE "LegalCopyright", "Copyright 2008 Jan Vrany\0"
       VALUE "ProductName", "CairoGraphics\0"
-      VALUE "ProductVersion", "5.4.6.1\0"
-      VALUE "ProductDate", "Fri, 08 Jan 2010 13:24:40 GMT\0"
+      VALUE "ProductVersion", "6.2.1.1\0"
+      VALUE "ProductDate", "Mon, 18 Jul 2011 16:13:45 GMT\0"
     END
 
   END
--- a/cvut_fel_cface.st	Mon Jul 18 15:31:42 2011 +0000
+++ b/cvut_fel_cface.st	Mon Jul 18 16:13:22 2011 +0000
@@ -142,7 +142,7 @@
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"'15'"$"
+    ^ "$SVN-Revision:"'17'"$"
 ! !
 
 !cvut_fel_cface class methodsFor:'documentation'!
--- a/extensions.st	Mon Jul 18 15:31:42 2011 +0000
+++ b/extensions.st	Mon Jul 18 16:13:22 2011 +0000
@@ -5,7 +5,8 @@
 !ClassDefinitionChange methodsFor:'accessing'!
 
 nameSpaceName:aSymbol
-    nameSpaceName := aSymbol.
+    nameSpaceOverride := aSymbol.
 
     "Created: / 22-01-2009 / 19:19:57 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 18-07-2011 / 17:06:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
--- a/libInit.cc	Mon Jul 18 15:31:42 2011 +0000
+++ b/libInit.cc	Mon Jul 18 16:13:22 2011 +0000
@@ -13,8 +13,17 @@
 
 #if defined(INIT_TEXT_SECTION) || defined(DLL_EXPORT)
 DLL_EXPORT void _libcvut_fel_cface_Init() INIT_TEXT_SECTION;
+// DLL_EXPORT void _libcvut_fel_cface_InitDefinition() INIT_TEXT_SECTION;
 #endif
 
+// void _libcvut_fel_cface_InitDefinition(pass, __pRT__, snd)
+// OBJ snd; struct __vmData__ *__pRT__; {
+// __BEGIN_PACKAGE2__("libcvut_fel_cface__DFN", _libcvut_fel_cface_InitDefinition, "cvut:fel/cface");
+// _cvut_137fel_137cface_Init(pass,__pRT__,snd);
+
+// __END_PACKAGE__();
+// }
+
 void _libcvut_fel_cface_Init(pass, __pRT__, snd)
 OBJ snd; struct __vmData__ *__pRT__; {
 __BEGIN_PACKAGE2__("libcvut_fel_cface", _libcvut_fel_cface_Init, "cvut:fel/cface");
--- a/vcmake.bat	Mon Jul 18 15:31:42 2011 +0000
+++ b/vcmake.bat	Mon Jul 18 16:13:22 2011 +0000
@@ -3,6 +3,6 @@
 @REM type vcmake, and wait...
 @REM do not edit - automatically generated from ProjectDefinition
 @REM -------
-make.exe -N -f bc.mak USEVC=1 %1 %2
+make.exe -N -f bc.mak -DUSEVC %1 %2
hg/jv-cface