Mercurial Mercurial > hg > stx-libscm / 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.
- Few fixes for windows
authorvranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
Sun, 30 Sep 2012 12:26:51 +0000
changeset 21 cc91320af6c6
parent 20 24ae01b36807
child 22 f45584f197d3
- Few fixes for windows
git/GitPrimitives.st file | annotate | diff | comparison | revisions
git/GitRepositoriesResource.st file | annotate | diff | comparison | revisions
git/GitTests.st file | annotate | diff | comparison | revisions
git/git.rc file | annotate | diff | comparison | revisions 
--- a/git/GitPrimitives.st	Sun Sep 30 08:42:35 2012 +0000
+++ b/git/GitPrimitives.st	Sun Sep 30 12:26:51 2012 +0000
@@ -26,9 +26,18 @@
         ExternalLibraryFunction dllPath: ExternalLibraryFunction dllPath , dllPath
     ].
 
-    (OperatingSystem isUNIXlike and:[OperatingSystem getLoginName = 'jv']) ifTrue:[
-        dllPath :=
-            (Array with: '/home/jv/work/libgit2/jv1/build').
+    (OperatingSystem getLoginName = 'jv') ifTrue:[
+        OperatingSystem isUNIXlike ifTrue:[
+            dllPath :=
+                (Array with: '/home/jv/work/libgit2/jv1/build') ,
+                dllPath
+        ].
+        OperatingSystem isMSWINDOWSlike ifTrue:[
+            dllPath :=
+                (Array with: 'E:\Other\libgit2\jv1\build\Debug') ,
+                dllPath
+        ].
+
     ].
 
     ^dllPath
--- a/git/GitRepositoriesResource.st	Sun Sep 30 08:42:35 2012 +0000
+++ b/git/GitRepositoriesResource.st	Sun Sep 30 12:26:51 2012 +0000
@@ -115,10 +115,14 @@
 !
 
 tearDown
+    [
+        repositoryDirectory recursiveRemove
+    ] on: Error do:[
 
-    repositoryDirectory recursiveRemove
+    ]
 
     "Created: / 09-12-2010 / 23:54:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 30-09-2012 / 05:26:04 / jv"
 ! !
 
 !GitRepositoriesResource methodsFor:'testing'!
--- a/git/GitTests.st	Sun Sep 30 08:42:35 2012 +0000
+++ b/git/GitTests.st	Sun Sep 30 12:26:51 2012 +0000
@@ -50,9 +50,16 @@
 
 tearDown
 
-    repositories do:[:e|e asFilename recursiveRemove].
+    repositories do:[:e|
+        [
+            e asFilename recursiveRemove
+        ] on: Error do:[
+            "Stupid windows"
+        ]
+    ].
 
     "Created: / 19-09-2012 / 19:03:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 30-09-2012 / 05:26:48 / jv"
 ! !
 
 !GitTests methodsFor:'tests - basic workflow'!
--- a/git/git.rc	Sun Sep 30 08:42:35 2012 +0000
+++ b/git/git.rc	Sun Sep 30 12:26:51 2012 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libscm_git.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,18,18
+  FILEVERSION     6,2,22,22
   PRODUCTVERSION  6,2,3,1
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
-      VALUE "FileVersion", "6.2.18.18\0"
+      VALUE "FileVersion", "6.2.22.22\0"
       VALUE "InternalName", "stx:libscm/git\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.1\0"
-      VALUE "ProductDate", "Sun, 30 Sep 2012 08:43:22 GMT\0"
+      VALUE "ProductDate", "Sun, 30 Sep 2012 12:27:48 GMT\0"
     END
 
   END
hg/stx-libscm