Fix endless loop in HGInstaller.
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 01 Aug 2013 14:51:50 +0100
changeset 338 665342670130
parent 337 b80675176fee
child 339 82d71f55dc73
Fix endless loop in HGInstaller. When compilation fails, it clean's up the working copy. The make clean also cleans documentation, which was not extracted. Borland make then run into an endless loop. As a quick workaround, extract doc directory.
mercurial/HGInstaller.st
--- a/mercurial/HGInstaller.st	Thu Jul 18 22:25:55 2013 +0100
+++ b/mercurial/HGInstaller.st	Thu Aug 01 14:51:50 2013 +0100
@@ -1,20 +1,13 @@
 "
-stx:libscm - a new source code management library for Smalltalk/X
-Copyright (C) 2012-2013 Jan Vrany
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License. 
+ COPYRIGHT (c) 2012-2013 by Jan Vrany
+              All Rights Reserved
 
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
 "
 "{ Package: 'stx:libscm/mercurial' }"
 
@@ -29,22 +22,15 @@
 
 copyright
 "
-stx:libscm - a new source code management library for Smalltalk/X
-Copyright (C) 2012-2013 Jan Vrany
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License. 
+ COPYRIGHT (c) 2012-2013 by Jan Vrany
+              All Rights Reserved
 
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
 "
 !
 
@@ -433,7 +419,7 @@
 doExtract
     | zar |
 
-    Transcript nextPutLine:'Extracting...'.
+    Transcript nextPutAll:'Extracting...'; cr.
     [
         destination recursiveMakeDirectory.
     ] on:Error
@@ -453,9 +439,7 @@
             src := src copyFrom:i + 1.
         ].
         
-        skipIt := (src startsWith:'git') 
-                        or:[src startsWith: 'mercurial/docs'].
-
+        skipIt := src startsWith:'git'.
         skipIt ifFalse:[
            dst := OperatingSystem isMSWINDOWSlike 
                    ifTrue:[destination / (src copyReplaceAll:$/ with:Filename separator)]
@@ -464,15 +448,14 @@
                dstd recursiveMakeDirectory
            ].
            dst writingFileDo:[:f | 
-               Transcript nextPutAll: '  '; nextPutLine: src.
+               Transcript nextPutAll: '  '; nextPutAll: src; cr.
                zar extract:zmemb fileName intoStream:f 
            ].
         ].
     ].
 
     "Created: / 07-07-2013 / 11:19:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 07-07-2013 / 19:22:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified (format): / 07-07-2013 / 20:51:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 01-08-2013 / 14:41:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doPrepare
@@ -594,5 +577,12 @@
     "Modified: / 11-07-2013 / 01:45:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!HGInstaller class methodsFor:'documentation'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+
 
 HGInstaller initialize!