author | Claus Gittinger <cg@exept.de> |
Wed, 01 Aug 2018 13:24:07 +0200 | |
branch | cvs_MAIN |
changeset 853 | 4e41a616ceca |
parent 791 | 5fc42e5ac2e6 |
child 893 | 044507d8af03 |
permissions | -rw-r--r-- |
44 | 1 |
" |
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
2 |
stx:libscm - a new source code management library for Smalltalk/X |
509
f92210d4585b
Updated copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
454
diff
changeset
|
3 |
Copyright (C) 2012-2015 Jan Vrany |
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
4 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
5 |
This library is free software; you can redistribute it and/or |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
6 |
modify it under the terms of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
7 |
License as published by the Free Software Foundation; either |
394 | 8 |
version 2.1 of the License. |
44 | 9 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
10 |
This library is distributed in the hope that it will be useful, |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
11 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
12 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
13 |
Lesser General Public License for more details. |
44 | 14 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
15 |
You should have received a copy of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
16 |
License along with this library; if not, write to the Free Software |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
17 |
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
44 | 18 |
" |
19 |
"{ Package: 'stx:libscm/common' }" |
|
20 |
||
791 | 21 |
"{ NameSpace: Smalltalk }" |
22 |
||
44 | 23 |
SCMAbstractTask subclass:#SCMAbstractFileoutLikeTask |
24 |
instanceVariableNames:'suppressClasses suppressExtensions suppresBuildSupportFiles |
|
348
a9647072025f
More support for Java extension methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
25 |
packageClassesChanged packageExtensionsChanged extensionMethods |
a9647072025f
More support for Java extension methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
26 |
fileout2codeMap' |
44 | 27 |
classVariableNames:'' |
28 |
poolDictionaries:'' |
|
29 |
category:'SCM-Common-StX-Tasks' |
|
30 |
! |
|
31 |
||
32 |
!SCMAbstractFileoutLikeTask class methodsFor:'documentation'! |
|
33 |
||
34 |
copyright |
|
35 |
" |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
36 |
stx:libscm - a new source code management library for Smalltalk/X |
509
f92210d4585b
Updated copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
454
diff
changeset
|
37 |
Copyright (C) 2012-2015 Jan Vrany |
44 | 38 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
39 |
This library is free software; you can redistribute it and/or |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
40 |
modify it under the terms of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
41 |
License as published by the Free Software Foundation; either |
394 | 42 |
version 2.1 of the License. |
44 | 43 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
44 |
This library is distributed in the hope that it will be useful, |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
45 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
46 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
47 |
Lesser General Public License for more details. |
44 | 48 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
49 |
You should have received a copy of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
50 |
License along with this library; if not, write to the Free Software |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
51 |
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
44 | 52 |
" |
53 |
! ! |
|
54 |
||
55 |
!SCMAbstractFileoutLikeTask methodsFor:'accessing'! |
|
56 |
||
57 |
extensionMethods |
|
58 |
^ extensionMethods |
|
59 |
! |
|
60 |
||
61 |
extensionMethods:aCollection"of Methods" |
|
62 |
||
63 |
extensionMethods := aCollection. |
|
64 |
||
65 |
"Modified: / 14-05-2009 / 13:38:15 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
66 |
! |
|
67 |
||
68 |
filesToGenerate |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
69 |
self error: 'Should not be sent'. |
44 | 70 |
^ self packageDefinition fileNamesToGenerate keys |
71 |
||
72 |
" |
|
394 | 73 |
SVN::CommitTask new |
74 |
package: #stx:libsvn; |
|
75 |
buildSupportFiles" |
|
44 | 76 |
|
77 |
"Created: / 27-11-2009 / 11:29:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
78 |
"Modified: / 22-02-2014 / 22:31:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
79 |
! |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
80 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
81 |
filesToGenerateFor: package |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
82 |
^ package definition fileNamesToGenerate keys |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
83 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
84 |
" |
394 | 85 |
SVN::CommitTask new |
86 |
package: #stx:libsvn; |
|
87 |
buildSupportFiles" |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
88 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
89 |
"Created: / 22-02-2014 / 22:31:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 90 |
! |
91 |
||
92 |
packageDefinition |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
93 |
self error: 'Should not be sent'. |
44 | 94 |
^self package definition |
95 |
||
96 |
"Created: / 27-11-2009 / 11:27:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
97 |
"Modified: / 21-02-2014 / 22:53:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 98 |
! |
99 |
||
100 |
suppresBuildSupportFiles |
|
101 |
^ suppresBuildSupportFiles |
|
102 |
! |
|
103 |
||
104 |
suppresBuildSupportFiles:something |
|
105 |
suppresBuildSupportFiles := something. |
|
106 |
! |
|
107 |
||
108 |
suppressClasses |
|
109 |
^ suppressClasses |
|
110 |
! |
|
111 |
||
112 |
suppressClasses:aBoolean |
|
113 |
suppressClasses := aBoolean. |
|
114 |
! |
|
115 |
||
116 |
suppressExtensions |
|
117 |
^ suppressExtensions |
|
118 |
! |
|
119 |
||
120 |
suppressExtensions:aBoolean |
|
121 |
suppressExtensions := aBoolean. |
|
122 |
! ! |
|
123 |
||
124 |
!SCMAbstractFileoutLikeTask methodsFor:'executing - private'! |
|
125 |
||
126 |
doAddNewContainers |
|
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
127 |
packages do:[:each | each isVirtual ifFalse: [ self doAddNewContainersFor: each ] ] |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
128 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
129 |
"Created: / 11-04-2008 / 10:58:53 / Jan Vrany <vranyj1@fel.cvut.cz>" |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
130 |
"Modified: / 19-08-2009 / 14:00:26 / Jan Vrany <vranyj1@fel.cvut.cz>" |
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
131 |
"Modified: / 27-02-2014 / 22:55:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
132 |
! |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
133 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
134 |
doAddNewContainersFor: package |
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
135 |
| wcroot containers | |
44 | 136 |
|
137 |
ActivityNotification notify:'Adding new containers'. |
|
394 | 138 |
containers := |
139 |
self isSelectiveFileoutTask |
|
140 |
ifTrue:[#()] |
|
141 |
ifFalse:[self containersToFileOutFor: package]. |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
142 |
wcroot := package temporaryWorkingCopyRoot. |
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
143 |
containers do:[:nm| |
394 | 144 |
| entry | |
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
145 |
|
394 | 146 |
entry := wcroot / nm. |
147 |
entry track. |
|
44 | 148 |
] |
149 |
||
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
150 |
"Created: / 22-02-2014 / 22:49:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 151 |
! |
152 |
||
153 |
doCompileCopyrightMethods |
|
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
154 |
packages do:[:each | each isVirtual ifFalse: [ self doCompileCopyrightMethodsFor: each ] ] |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
155 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
156 |
"Modified: / 16-08-2009 / 12:59:50 / Jan Vrany <vranyj1@fel.cvut.cz>" |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
157 |
"Created: / 08-04-2010 / 14:31:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
158 |
"Modified: / 27-02-2014 / 22:55:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
159 |
! |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
160 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
161 |
doCompileCopyrightMethodsFor: package |
44 | 162 |
| klasses source | |
163 |
||
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
164 |
(package definition class includesSelector: #copyright) ifFalse:[^self]. |
44 | 165 |
ActivityNotification notify:'Compiling #copyright methods...'. |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
166 |
klasses := (self classesToFileOutFor: package) asArray. |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
167 |
source := (package definition class compiledMethodAt: #copyright) source. |
44 | 168 |
|
394 | 169 |
klasses |
170 |
withIndexDo:[:cls :index | |
|
171 |
|metaCls| |
|
172 |
metaCls := cls theMetaclass. |
|
173 |
(((metaCls includesSelector:#copyright) not) and:[metaCls programmingLanguage isSmalltalk]) |
|
174 |
ifTrue:[ |
|
175 |
metaCls compile:source classified:'documentation'. |
|
176 |
(metaCls compiledMethodAt:#copyright) |
|
177 |
setPackage:package name asSymbol |
|
178 |
]. |
|
179 |
ProgressNotification newException |
|
180 |
messageText: ('Compiling %1 (%2)' bindWith:#copyright |
|
181 |
with:cls nameWithoutPrefix); |
|
182 |
parameter: (100 / klasses size) * index; |
|
183 |
raiseRequest. |
|
184 |
] |
|
44 | 185 |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
186 |
"Created: / 21-02-2014 / 22:59:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 187 |
! |
188 |
||
189 |
doCompileVersionMethods |
|
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
190 |
packages do:[:each | |
394 | 191 |
each isVirtual ifFalse: [ |
192 |
| klasses | |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
193 |
|
394 | 194 |
klasses := self classesToFileOutFor: each. |
195 |
self doCompileVersionMethodsFor: each in: klasses asArray. |
|
196 |
] |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
197 |
]. |
353
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
348
diff
changeset
|
198 |
|
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
348
diff
changeset
|
199 |
"Created: / 09-10-2013 / 11:57:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
200 |
"Modified: / 27-02-2014 / 22:55:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
353
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
348
diff
changeset
|
201 |
! |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
348
diff
changeset
|
202 |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
203 |
doCompileVersionMethodsFor: package in: klasses |
353
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
348
diff
changeset
|
204 |
| versionMethodName| |
44 | 205 |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
206 |
versionMethodName := package manager nameOfVersionMethodInClasses. |
44 | 207 |
ActivityNotification notify:'Compiling #version methods...'. |
394 | 208 |
klasses |
454
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
209 |
withIndexDo:[:cls :index | |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
210 |
|metaCls| |
44 | 211 |
|
454
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
212 |
cls isJavaClass ifFalse:[ |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
213 |
metaCls := cls theMetaclass. |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
214 |
((metaCls includesSelector:versionMethodName) not |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
215 |
"JV@2012-11-14: libsvn did this check, however, it is not valid for |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
216 |
SCMs that does not expand keywords. I disable it, but kept as comment |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
217 |
as I do not remember why it was good for..." |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
218 |
"or:[ ((cls perform:versionMethodName asSymbol) startsWith:'$Id') not ]") |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
219 |
ifTrue:[ |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
220 |
metaCls compile:(metaCls |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
221 |
versionMethodTemplateForSourceCodeManager:package manager) |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
222 |
classified:'documentation'. |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
223 |
(metaCls compiledMethodAt:versionMethodName) |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
224 |
setPackage:package name asSymbol |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
225 |
]. |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
226 |
package manager utilities ensureCorrectVersionMethodsInClass: cls usingManager: package manager. |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
227 |
]. |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
228 |
^ ProgressNotification newException |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
229 |
messageText: ('Compiling %1 (%2)' bindWith:versionMethodName |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
230 |
with:cls nameWithoutPrefix); |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
231 |
parameter: (100 / klasses size) * index; |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
232 |
raiseRequest |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
233 |
]. |
44 | 234 |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
235 |
(self extensionMethodsToFileOutFor: package) notEmpty ifTrue:[ |
454
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
236 |
| def | |
44 | 237 |
|
454
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
238 |
"TODO: Not programming language aware..." |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
239 |
((def := package definition) class includesSelector: package manager nameOfVersionMethodForExtensions) ifFalse:[ |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
240 |
def class |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
241 |
compile: |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
242 |
(package manager versionMethodTemplateForSmalltalkFor:package manager nameOfVersionMethodForExtensions) |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
243 |
classified: #documentation. |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
244 |
(def class compiledMethodAt:package manager nameOfVersionMethodForExtensions) |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
245 |
setPackage:package name asSymbol |
44 | 246 |
|
454
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
247 |
] |
44 | 248 |
] |
249 |
||
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
250 |
"Created: / 21-02-2014 / 23:01:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
454
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
251 |
"Modified: / 31-07-2014 / 09:04:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 252 |
! |
253 |
||
122
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
254 |
doFileOut |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
255 |
"Fileouts everything to the working copy" |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
256 |
|
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
257 |
self |
394 | 258 |
doUpdateBuildSupportFiles; |
259 |
doRenameContainers; |
|
260 |
doFileOutPackageClasses; |
|
261 |
doFileOutPackageExtensions; |
|
262 |
doAddNewContainers; |
|
263 |
doRemoveOldContainers. |
|
122
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
264 |
|
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
265 |
"Created: / 10-05-2012 / 17:05:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
266 |
"Modified: / 21-11-2012 / 00:43:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
267 |
! |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
268 |
|
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
269 |
doFileOutAll |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
270 |
|
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
271 |
self |
394 | 272 |
doUpdateCode; |
273 |
doFileOut. |
|
122
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
274 |
|
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
275 |
"Created: / 17-08-2009 / 18:28:18 / Jan Vrany <vranyj1@fel.cvut.cz>" |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
276 |
"Modified: / 10-05-2012 / 17:06:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
277 |
! |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
278 |
|
44 | 279 |
doFileOutPackageClasses |
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
280 |
packages do:[:each | each isVirtual ifFalse: [ self doFileOutPackageClassesFor: each ] ]. |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
281 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
282 |
"Created: / 11-04-2008 / 10:58:16 / Jan Vrany <vranyj1@fel.cvut.cz>" |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
283 |
"Modified: / 19-08-2009 / 13:44:00 / Jan Vrany <vranyj1@fel.cvut.cz>" |
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
284 |
"Modified: / 27-02-2014 / 22:55:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
285 |
! |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
286 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
287 |
doFileOutPackageClassesFor: package |
44 | 288 |
|klasses| |
289 |
||
290 |
suppressClasses == true ifTrue:[^self]. |
|
291 |
||
292 |
ActivityNotification notify:'Filing out package classes'. |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
293 |
klasses := (self classesToFileOutFor: package) asArray. |
394 | 294 |
klasses |
295 |
withIndexDo:[:cls :index | |
|
296 |
|clsStream| |
|
297 |
ProgressNotification newException |
|
298 |
messageText: 'Filing out ' , cls nameWithoutPrefix; |
|
299 |
parameter: (100 / klasses size) * index; |
|
300 |
raiseRequest. |
|
44 | 301 |
|
394 | 302 |
(self shouldFileOutClass:cls) ifTrue:[package fileOutClass: cls] |
303 |
]. |
|
44 | 304 |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
305 |
"Created: / 21-02-2014 / 23:09:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 306 |
! |
307 |
||
308 |
doFileOutPackageExtensions |
|
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
309 |
packages do:[:each | each isVirtual ifFalse: [ self doFileOutPackageExtensionsFor: each ] ] |
44 | 310 |
|
311 |
"Modified: / 07-04-2008 / 08:37:25 / janfrog" |
|
312 |
"Created: / 11-04-2008 / 10:58:36 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
313 |
"Modified: / 14-05-2009 / 13:37:40 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
314 |
"Modified: / 27-02-2014 / 22:55:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
315 |
! |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
316 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
317 |
doFileOutPackageExtensionsFor: package |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
318 |
| extensions | |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
319 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
320 |
suppressExtensions == true ifTrue:[^self]. |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
321 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
322 |
extensions := self extensionMethodsToFileOutFor: package. |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
323 |
extensions notEmpty ifTrue:[ |
394 | 324 |
package fileOutExtensions: extensions. |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
325 |
] |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
326 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
327 |
"Created: / 21-02-2014 / 23:10:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
328 |
"Modified: / 22-02-2014 / 23:04:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 329 |
! |
330 |
||
331 |
doInitStateVariables |
|
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
332 |
packageClassesChanged := packages contains:[:each| each isVirtual ifFalse: [ each classesHasChanged ] ] . |
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
333 |
packageExtensionsChanged := packages contains:[:each| each isVirtual ifFalse: [ each extensionsHasChanged ] ]. |
44 | 334 |
|
335 |
"Created: / 17-06-2009 / 10:17:04 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
336 |
"Modified: / 13-08-2009 / 10:18:37 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
337 |
"Modified: / 28-02-2014 / 09:52:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 338 |
! |
339 |
||
340 |
doRemoveOldContainers |
|
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
341 |
packages do:[:each | each isVirtual ifFalse: [ self doRemoveOldContainersFor: each ] ] |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
342 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
343 |
"Created: / 11-04-2008 / 11:00:27 / Jan Vrany <vranyj1@fel.cvut.cz>" |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
344 |
"Modified: / 19-08-2009 / 15:03:51 / Jan Vrany <vranyj1@fel.cvut.cz>" |
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
345 |
"Modified: / 27-02-2014 / 22:55:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
346 |
! |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
347 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
348 |
doRemoveOldContainersFor: package |
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
349 |
| wcroot containers containersToKeep containersToDelete | |
44 | 350 |
|
351 |
self isSelectiveFileoutTask ifTrue:[ |
|
394 | 352 |
^ self |
44 | 353 |
]. |
354 |
ActivityNotification notify:'Removing old containers'. |
|
117
3014c22e2eab
Refactoring (part 1): SCMPackageModel>>workingCopy renamed to temporaryWorkingCopy
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
114
diff
changeset
|
355 |
wcroot := package temporaryWorkingCopyRoot. |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
356 |
containers := package containers. |
362
a2b08403cfa8
Fix for issue #26: Java extension files are removed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
353
diff
changeset
|
357 |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
358 |
containersToKeep := package containersToKeep. |
44 | 359 |
containersToDelete := containers \ containersToKeep. |
362
a2b08403cfa8
Fix for issue #26: Java extension files are removed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
353
diff
changeset
|
360 |
"/ Fix for issue #26: Java extension files are removed. |
a2b08403cfa8
Fix for issue #26: Java extension files are removed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
353
diff
changeset
|
361 |
"/ Filter out all Java extension containers which are for classes which |
a2b08403cfa8
Fix for issue #26: Java extension files are removed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
353
diff
changeset
|
362 |
"/ are currently not loaded. |
a2b08403cfa8
Fix for issue #26: Java extension files are removed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
353
diff
changeset
|
363 |
containersToDelete := containersToDelete reject:[:each | |
394 | 364 |
(each startsWith: 'java/extensions/') |
365 |
and:[ |
|
366 |
| nm | |
|
362
a2b08403cfa8
Fix for issue #26: Java extension files are removed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
353
diff
changeset
|
367 |
|
394 | 368 |
nm := each copyFrom:17 to: (each lastIndexOf: $.) - 1. |
369 |
(JavaVM registry classes contains: [:cls | cls binaryName = nm]) not. |
|
370 |
]. |
|
362
a2b08403cfa8
Fix for issue #26: Java extension files are removed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
353
diff
changeset
|
371 |
]. |
a2b08403cfa8
Fix for issue #26: Java extension files are removed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
353
diff
changeset
|
372 |
|
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
373 |
containersToDelete do:[:nm| |
394 | 374 |
| entry | |
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
375 |
|
394 | 376 |
entry := wcroot / nm. |
377 |
entry remove |
|
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
378 |
] |
44 | 379 |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
380 |
"Created: / 21-02-2014 / 23:12:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 381 |
! |
382 |
||
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
383 |
doRenameContainerForClassNamed: new for: package using: renames language: lang |
44 | 384 |
|
391
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
385 |
| wcroot assoc old circular oldC oldE newC newE | |
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
386 |
assoc := renames detectLast:[:each | each key == new ] ifNone:[ ^ self ]. |
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
387 |
old := assoc value. |
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
388 |
renames remove: assoc. |
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
389 |
|
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
390 |
"/ Call recursively to process sequence of renames but not if |
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
391 |
"/ its a circular rename... |
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
392 |
circular := (renames contains:[:each | each value == new ]). |
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
393 |
circular ifTrue:[ ^ self ]. |
394 | 394 |
self doRenameContainerForClassNamed: old for: package using: renames language: lang. |
391
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
395 |
|
117
3014c22e2eab
Refactoring (part 1): SCMPackageModel>>workingCopy renamed to temporaryWorkingCopy
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
114
diff
changeset
|
396 |
wcroot := package temporaryWorkingCopyRoot. |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
397 |
oldC := package containerNameForClassNamed: old language: lang . |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
398 |
newC := package containerNameForClassNamed: new language: lang . |
89
874f18be0cbd
Fixed renaming of class containers.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
81
diff
changeset
|
399 |
(oldE := wcroot / oldC) exists ifTrue:[ |
394 | 400 |
packageClassesChanged := true. |
401 |
newE := wcroot / newC. |
|
402 |
oldE moveTo: newE. |
|
44 | 403 |
]. |
404 |
||
405 |
"Created: / 11-04-2008 / 11:00:27 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
406 |
"Modified: / 19-08-2009 / 15:03:51 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
407 |
"Created: / 06-08-2011 / 21:33:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
391
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
408 |
"Modified: / 05-03-2014 / 00:13:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 409 |
! |
410 |
||
411 |
doRenameContainers |
|
412 |
||
391
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
413 |
| renames names | |
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
414 |
renames := OrderedCollection new. |
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
415 |
names := OrderedCollection new. |
44 | 416 |
ChangeSet current do: |
394 | 417 |
[:chg| |
418 |
chg isClassRenameChange ifTrue:[ |
|
419 |
renames add: chg className -> chg oldName. |
|
420 |
names add: chg fullClassName. |
|
421 |
]]. |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
422 |
packages do:[:each | |
394 | 423 |
each isVirtual ifFalse: [ |
424 |
(self classesToFileOutFor: each) do:[:cls| |
|
425 |
(names includes: cls name) ifTrue:[ |
|
426 |
self doRenameContainerForClassNamed: cls name for: each using: renames language: cls programmingLanguage. |
|
427 |
] |
|
428 |
] |
|
429 |
] |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
430 |
]. |
44 | 431 |
|
432 |
"Created: / 11-04-2008 / 11:00:27 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
433 |
"Modified: / 19-08-2009 / 15:03:51 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
434 |
"Created: / 06-08-2011 / 21:13:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
435 |
"Modified: / 27-02-2014 / 22:55:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 436 |
! |
437 |
||
438 |
doUpdateBuildSupportFiles |
|
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
439 |
packages do:[:each | each isVirtual ifFalse: [ self doUpdateBuildSupportFilesFor: each ] ] |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
440 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
441 |
"Created: / 20-06-2009 / 16:01:16 / Jan Vrany <vranyj1@fel.cvut.cz>" |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
442 |
"Modified: / 21-06-2009 / 15:18:17 / Jan Vrany <vranyj1@fel.cvut.cz>" |
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
443 |
"Modified: / 27-02-2014 / 22:56:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
444 |
! |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
445 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
446 |
doUpdateBuildSupportFilesFor: package |
44 | 447 |
|pkgDef| |
448 |
||
449 |
suppresBuildSupportFiles == true ifTrue:[ |
|
394 | 450 |
^self. |
44 | 451 |
]. |
452 |
||
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
453 |
pkgDef := package definition. |
44 | 454 |
|
455 |
(self isSelectiveFileoutTask and:[packageClassesChanged not and:[(classes includes: pkgDef) not]]) ifTrue:[ |
|
394 | 456 |
^self. |
44 | 457 |
]. |
458 |
||
459 |
ActivityNotification notify:'Updating build files'. |
|
460 |
"First, generate files into a temporary files - so originals |
|
461 |
are not destroyed when something goes wrong." |
|
394 | 462 |
(self filesToGenerateFor: package) do:[:supportFileName | |
463 |
| supportFile | |
|
44 | 464 |
|
394 | 465 |
supportFile := package temporaryWorkingCopyRoot / (supportFileName , '.tmp'). |
466 |
(packageClassesChanged or:[ supportFile exists not ]) ifTrue:[ |
|
467 |
ActivityNotification notify:'Updating ' , supportFileName. |
|
468 |
supportFile directory exists ifFalse: [supportFile directory makeDirectory]. |
|
469 |
supportFile writingFileDo:[:s| |
|
470 |
s nextPutAll:(self for: package generateFile:supportFileName) |
|
471 |
] |
|
472 |
] |
|
44 | 473 |
]. |
474 |
"Now, copy them over the old files" |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
475 |
(self filesToGenerateFor: package) do:[:supportFileName | |
394 | 476 |
| supportFile supportFileTmp | |
44 | 477 |
|
394 | 478 |
supportFile := package temporaryWorkingCopyRoot / supportFileName. |
479 |
supportFileTmp := package temporaryWorkingCopyRoot / (supportFileName , '.tmp'). |
|
44 | 480 |
|
394 | 481 |
supportFileTmp moveTo: supportFile. |
482 |
supportFile track. |
|
44 | 483 |
]. |
484 |
||
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
485 |
"Created: / 21-02-2014 / 23:16:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
486 |
"Modified: / 22-02-2014 / 22:47:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 487 |
! |
488 |
||
122
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
489 |
doUpdateCode |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
490 |
"Updates project definitions and compiles version/copyright methods" |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
491 |
|
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
492 |
self |
394 | 493 |
doInitStateVariables; |
494 |
doCompileVersionMethods; |
|
495 |
doCompileCopyrightMethods; |
|
496 |
doUpdateProjectDefinition. |
|
122
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
497 |
|
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
498 |
"Created: / 10-05-2012 / 17:04:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
499 |
! |
f72225c1f433
Adde parent/child relationship to SCMAbstractPackageModel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
117
diff
changeset
|
500 |
|
44 | 501 |
doUpdateProjectDefinition |
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
502 |
packages do:[:each | each isVirtual ifFalse: [ self doUpdateProjectDefinitionFor: each ] ] |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
503 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
504 |
"Created: / 11-04-2008 / 11:01:06 / Jan Vrany <vranyj1@fel.cvut.cz>" |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
505 |
"Modified: / 13-08-2009 / 09:13:14 / Jan Vrany <vranyj1@fel.cvut.cz>" |
387
ebec1ef28839
Added notion if 'virtual' package
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
381
diff
changeset
|
506 |
"Modified: / 27-02-2014 / 22:56:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
507 |
! |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
508 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
509 |
doUpdateProjectDefinitionFor: package |
271
b0f2a22871b6
Care for class removal and superclass/pool change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
268
diff
changeset
|
510 |
| prjClass classesSpec classNamesAndAttributesMap | |
44 | 511 |
|
512 |
(packageClassesChanged | packageExtensionsChanged) ifFalse:[ |
|
454
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
513 |
^ self |
44 | 514 |
]. |
515 |
ActivityNotification notify:'Updating project definition'. |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
516 |
prjClass := ProjectDefinition definitionClassForPackage: package name createIfAbsent:true. |
271
b0f2a22871b6
Care for class removal and superclass/pool change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
268
diff
changeset
|
517 |
|
b0f2a22871b6
Care for class removal and superclass/pool change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
268
diff
changeset
|
518 |
"/Update classlist beforehand - to care about order and removals... |
b0f2a22871b6
Care for class removal and superclass/pool change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
268
diff
changeset
|
519 |
classNamesAndAttributesMap := Dictionary new. |
b0f2a22871b6
Care for class removal and superclass/pool change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
268
diff
changeset
|
520 |
prjClass classNamesAndAttributes do:[:nameOrPair | |
454
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
521 |
nameOrPair isArray |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
522 |
ifTrue:[classNamesAndAttributesMap at: nameOrPair first put: nameOrPair] |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
523 |
ifFalse:[classNamesAndAttributesMap at: nameOrPair put: (Array with: nameOrPair)] |
271
b0f2a22871b6
Care for class removal and superclass/pool change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
268
diff
changeset
|
524 |
]. |
454
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
525 |
classesSpec := prjClass searchForClasses reject:[:cls | cls isJavaClass ] thenCollect:[:cls| |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
526 |
classNamesAndAttributesMap at: cls name ifAbsent:[Array with: cls name] |
271
b0f2a22871b6
Care for class removal and superclass/pool change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
268
diff
changeset
|
527 |
]. |
b0f2a22871b6
Care for class removal and superclass/pool change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
268
diff
changeset
|
528 |
prjClass classNamesAndAttributes:classesSpec usingCompiler:nil. |
b0f2a22871b6
Care for class removal and superclass/pool change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
268
diff
changeset
|
529 |
|
b0f2a22871b6
Care for class removal and superclass/pool change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
268
diff
changeset
|
530 |
|
b0f2a22871b6
Care for class removal and superclass/pool change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
268
diff
changeset
|
531 |
"/Now do standard update |
b0f2a22871b6
Care for class removal and superclass/pool change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
268
diff
changeset
|
532 |
Class packageQuerySignal answer:prjClass package do:[ |
454
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
533 |
prjClass theNonMetaclass |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
534 |
forEachContentsMethodsCodeToCompileDo:[:code :category | |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
535 |
(code startsWith: 'excludedFromPreRequisites') |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
536 |
ifFalse:[prjClass theMetaclass compile:code classified:category] |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
537 |
] |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
538 |
"/ignoreOldEntries: false |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
539 |
ignoreOldDefinition: false |
271
b0f2a22871b6
Care for class removal and superclass/pool change.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
268
diff
changeset
|
540 |
] |
44 | 541 |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
542 |
"Created: / 21-02-2014 / 23:17:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
454
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
543 |
"Modified: / 30-07-2014 / 20:42:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 544 |
! ! |
545 |
||
546 |
!SCMAbstractFileoutLikeTask methodsFor:'private'! |
|
547 |
||
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
548 |
classesToFileOutFor: package |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
549 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
550 |
suppressClasses == true ifTrue:[^#()]. |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
551 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
552 |
^ package classesFiltered: |
394 | 553 |
[:class | |
554 |
class isLoaded and: [ classes isNil or: [ classes includes: class ] ] ] |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
555 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
556 |
"Created: / 21-02-2014 / 22:59:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
557 |
"Modified: / 22-02-2014 / 22:19:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 558 |
! |
559 |
||
560 |
containersToFileOut |
|
426
1933163ba3bb
Fixed regression for selective class commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
394
diff
changeset
|
561 |
^ OrderedCollection streamContents: [ :s | |
1933163ba3bb
Fixed regression for selective class commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
394
diff
changeset
|
562 |
packages do:[:each | |
1933163ba3bb
Fixed regression for selective class commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
394
diff
changeset
|
563 |
each isVirtual ifFalse: [ |
1933163ba3bb
Fixed regression for selective class commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
394
diff
changeset
|
564 |
| containers | |
1933163ba3bb
Fixed regression for selective class commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
394
diff
changeset
|
565 |
containers := (self containersToFileOutFor: each) collect:[ :container | each repositoryRoot , Filename separator , container ]. |
1933163ba3bb
Fixed regression for selective class commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
394
diff
changeset
|
566 |
s nextPutAll: containers. |
1933163ba3bb
Fixed regression for selective class commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
394
diff
changeset
|
567 |
] |
1933163ba3bb
Fixed regression for selective class commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
394
diff
changeset
|
568 |
] |
1933163ba3bb
Fixed regression for selective class commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
394
diff
changeset
|
569 |
]. |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
570 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
571 |
"Created: / 14-05-2009 / 11:35:05 / Jan Vrany <vranyj1@fel.cvut.cz>" |
426
1933163ba3bb
Fixed regression for selective class commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
394
diff
changeset
|
572 |
"Modified: / 01-05-2014 / 10:07:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
573 |
! |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
574 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
575 |
containersToFileOutFor: package |
44 | 576 |
| containers extensions | |
577 |
||
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
578 |
containers := (self classesToFileOutFor: package) |
394 | 579 |
collect: [:class | package containerNameForClass: class ]. |
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
580 |
(extensions := (self extensionMethodsToFileOutFor: package)) notEmpty ifTrue:[ |
394 | 581 |
| languages extensionsNonJava extensionsJava | |
348
a9647072025f
More support for Java extension methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
582 |
|
394 | 583 |
extensionsNonJava := extensions reject:[:m | m mclass programmingLanguage isJava]. |
584 |
extensionsJava := extensions select:[:m | m mclass programmingLanguage isJava]. |
|
585 |
languages := (extensionsNonJava collect:[:each|each programmingLanguage]) asSet. |
|
586 |
languages do: [:lang| containers add: (package containerNameForExtensions: lang)]. |
|
587 |
extensionsJava do:[:m | |
|
588 |
| container | |
|
348
a9647072025f
More support for Java extension methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
589 |
|
394 | 590 |
container := package containerNameForExtensions: m programmingLanguage javaClass: m mclass. |
591 |
(containers includes: container) ifFalse:[ |
|
592 |
containers add: container |
|
593 |
]. |
|
594 |
]. |
|
348
a9647072025f
More support for Java extension methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
595 |
]. |
44 | 596 |
^ containers |
597 |
||
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
598 |
"Created: / 22-02-2014 / 22:49:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 599 |
! |
600 |
||
601 |
extensionMethodsToFileOut |
|
394 | 602 |
self error: 'Should no longer be sent'. |
44 | 603 |
^ self package extensionsFiltered: |
394 | 604 |
[:mth | |
605 |
extensionMethods isNil or: [ extensionMethods includes: mth ] ] |
|
44 | 606 |
|
607 |
"Created: / 14-05-2009 / 11:32:01 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
608 |
"Modified: / 22-02-2014 / 22:19:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 609 |
! |
610 |
||
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
611 |
extensionMethodsToFileOutFor: package |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
612 |
^package extensionsFiltered: |
394 | 613 |
[:mth | |
614 |
extensionMethods isNil or: [ extensionMethods includes: mth ] ] |
|
44 | 615 |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
616 |
"Created: / 21-02-2014 / 23:03:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
617 |
"Modified: / 22-02-2014 / 22:20:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
618 |
! |
44 | 619 |
|
381
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
620 |
for: package generateFile: file |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
621 |
| def contents savedClassFilenames | |
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
622 |
|
3dde2b867931
SCMAbstractFileoutLikeTask refactored to support multiple packages.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
362
diff
changeset
|
623 |
def := package definition. |
44 | 624 |
file ~= 'abbrev.stc' ifTrue:[^def generateFile: file]. |
625 |
||
626 |
"Yet another kludge to trick Smalltalk>>fileNameForClass:, sigh" |
|
627 |
savedClassFilenames := Dictionary new. |
|
454
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
628 |
(def searchForClasses reject:[:e|e owningClass notNil or:[ e isJavaClass ] ] ) do: |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
629 |
[:cls| |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
630 |
savedClassFilenames |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
631 |
at: cls |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
632 |
put: cls getClassFilename. |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
633 |
cls setClassFilename: (package containerNameForClass: cls)]. |
44 | 634 |
contents := def generateFile: file. |
635 |
savedClassFilenames keysAndValuesDo: |
|
454
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
636 |
[:cls :classFileName| |
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
637 |
cls setClassFilename: classFileName]. |
44 | 638 |
^contents |
81
eeb86ad71bc3
Fixed all references to libsvn classes. Added SCMCompatModeQuery.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
70
diff
changeset
|
639 |
|
454
d17370e0936e
Support for Java classes (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
426
diff
changeset
|
640 |
"Modified: / 30-07-2014 / 20:43:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
44 | 641 |
! |
642 |
||
643 |
shouldFileOutClass: class |
|
389
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
387
diff
changeset
|
644 |
^ packages anySatisfy: |
394 | 645 |
[:p | p name = class package and:[ p hasChangesInClass: class ] ] |
44 | 646 |
|
647 |
"Created: / 24-06-2009 / 19:04:48 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
648 |
"Modified: / 19-08-2009 / 13:54:39 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
389
1e2e6ce45878
Added new warning to commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
387
diff
changeset
|
649 |
"Modified: / 03-03-2014 / 09:18:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
426
1933163ba3bb
Fixed regression for selective class commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
394
diff
changeset
|
650 |
! ! |
44 | 651 |
|
652 |
!SCMAbstractFileoutLikeTask methodsFor:'queries'! |
|
653 |
||
654 |
isSelectiveFileoutTask |
|
655 |
^ classes notNil or: [ extensionMethods notNil ] |
|
656 |
||
657 |
"Created: / 14-05-2009 / 13:24:52 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
658 |
! ! |
|
659 |
||
660 |
!SCMAbstractFileoutLikeTask class methodsFor:'documentation'! |
|
661 |
||
791 | 662 |
version_CVS |
663 |
^ '$Header$' |
|
664 |
! |
|
665 |
||
44 | 666 |
version_GIT |
667 |
"Never, ever change this method. Ask JV or CG why" |
|
668 |
^thisContext method mclass theNonMetaclass instVarNamed: #revision |
|
669 |
! |
|
670 |
||
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
671 |
version_HG |
114
8b27cb46af9a
version_HG changed to return String.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
89
diff
changeset
|
672 |
|
8b27cb46af9a
version_HG changed to return String.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
89
diff
changeset
|
673 |
^ '$Changeset: <not expanded> $' |
53
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
674 |
! |
8043f7b6f41a
- More common code refactored
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
44
diff
changeset
|
675 |
|
44 | 676 |
version_SVN |
791 | 677 |
^ '$Id$' |
44 | 678 |
! ! |
426
1933163ba3bb
Fixed regression for selective class commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
394
diff
changeset
|
679 |