Mercurial > hg > truffle
annotate src/share/tools/ProjectCreator/BuildConfig.java @ 4634:0f899c0b7e86
fixed VS project files
author | Christian Haeubl <christian.haeubl@oracle.com> |
---|---|
date | Fri, 17 Feb 2012 10:30:39 -0800 |
parents | 8bc6f680a88d |
children | 33df1aeaebbf |
rev | line source |
---|---|
0 | 1 /* |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
2 * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. |
0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | |
5 * This code is free software; you can redistribute it and/or modify it | |
6 * under the terms of the GNU General Public License version 2 only, as | |
7 * published by the Free Software Foundation. | |
8 * | |
9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 * version 2 for more details (a copy is included in the LICENSE file that | |
13 * accompanied this code). | |
14 * | |
15 * You should have received a copy of the GNU General Public License version | |
16 * 2 along with this work; if not, write to the Free Software Foundation, | |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 * | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
844
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
844
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
844
diff
changeset
|
21 * questions. |
0 | 22 * |
23 */ | |
24 | |
25 import java.io.File; | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
26 import java.util.Enumeration; |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
27 import java.util.Hashtable; |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
28 import java.util.Iterator; |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
29 import java.util.Vector; |
0 | 30 |
31 class BuildConfig { | |
32 Hashtable vars; | |
33 Vector basicNames, basicPaths; | |
34 String[] context; | |
35 | |
36 static CompilerInterface ci; | |
37 static CompilerInterface getCI() { | |
38 if (ci == null) { | |
39 String comp = (String)getField(null, "CompilerVersion"); | |
40 try { | |
41 ci = (CompilerInterface)Class.forName("CompilerInterface" + comp).newInstance(); | |
42 } catch (Exception cnfe) { | |
43 System.err.println("Cannot find support for compiler " + comp); | |
44 throw new RuntimeException(cnfe.toString()); | |
45 } | |
46 } | |
47 return ci; | |
48 } | |
49 | |
50 protected void initNames(String flavour, String build, String outDll) { | |
51 if (vars == null) vars = new Hashtable(); | |
52 | |
53 String flavourBuild = flavour + "_" + build; | |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
54 String platformName = getFieldString(null, "PlatformName"); |
1972 | 55 System.out.println(); |
56 System.out.println(flavourBuild); | |
57 | |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
58 put("Name", getCI().makeCfgName(flavourBuild, platformName)); |
0 | 59 put("Flavour", flavour); |
60 put("Build", build); | |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
61 put("PlatformName", platformName); |
0 | 62 |
63 // ones mentioned above were needed to expand format | |
64 String buildBase = expandFormat(getFieldString(null, "BuildBase")); | |
65 String sourceBase = getFieldString(null, "SourceBase"); | |
4177
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
3543
diff
changeset
|
66 String outDir = buildBase; |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
3543
diff
changeset
|
67 String value = System.getenv("OUT_DIR"); |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
3543
diff
changeset
|
68 if (value != null) { |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
3543
diff
changeset
|
69 outDir = value; |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
3543
diff
changeset
|
70 } |
4597
8bc6f680a88d
fixed visual studio project files
Christian Haeubl <christian.haeubl@oracle.com>
parents:
4572
diff
changeset
|
71 |
8bc6f680a88d
fixed visual studio project files
Christian Haeubl <christian.haeubl@oracle.com>
parents:
4572
diff
changeset
|
72 int lastDirectorySeparator = Math.max(outDir.lastIndexOf("/"), outDir.lastIndexOf("\\")); |
8bc6f680a88d
fixed visual studio project files
Christian Haeubl <christian.haeubl@oracle.com>
parents:
4572
diff
changeset
|
73 if (lastDirectorySeparator >= 0) { |
8bc6f680a88d
fixed visual studio project files
Christian Haeubl <christian.haeubl@oracle.com>
parents:
4572
diff
changeset
|
74 outDir = outDir.substring(0, lastDirectorySeparator); |
4475
f400f9554f09
fixed windows build, filtered methodDataOop for reflection
Christian Haeubl <christian.haeubl@oracle.com>
parents:
4474
diff
changeset
|
75 } |
f400f9554f09
fixed windows build, filtered methodDataOop for reflection
Christian Haeubl <christian.haeubl@oracle.com>
parents:
4474
diff
changeset
|
76 |
4634
0f899c0b7e86
fixed VS project files
Christian Haeubl <christian.haeubl@oracle.com>
parents:
4597
diff
changeset
|
77 outDir += Util.sep + build + Util.sep + "jre" + Util.sep + "bin"; |
4572
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
78 if (flavour.equals("graal")) { |
4177
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
3543
diff
changeset
|
79 outDir += Util.sep + "graal"; |
4572
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
80 } else if (flavour.equals("compiler1")) { |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
81 outDir += Util.sep + "client"; |
4177
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
3543
diff
changeset
|
82 } else { |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
3543
diff
changeset
|
83 outDir += Util.sep + "server"; |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
3543
diff
changeset
|
84 } |
c843578c269d
Make building work on Windows.
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents:
3543
diff
changeset
|
85 buildBase = outDir; |
0 | 86 |
87 put("Id", flavourBuild); | |
88 put("OutputDir", outDir); | |
89 put("SourceBase", sourceBase); | |
90 put("BuildBase", buildBase); | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
91 put("OutputDll", outDir + Util.sep + outDll); |
0 | 92 |
93 context = new String [] {flavourBuild, flavour, build, null}; | |
94 } | |
95 | |
96 protected void init(Vector includes, Vector defines) { | |
97 initDefaultDefines(defines); | |
98 initDefaultCompilerFlags(includes); | |
99 initDefaultLinkerFlags(); | |
1972 | 100 handleDB(); |
0 | 101 } |
102 | |
103 | |
104 protected void initDefaultCompilerFlags(Vector includes) { | |
105 Vector compilerFlags = new Vector(); | |
106 | |
107 compilerFlags.addAll(getCI().getBaseCompilerFlags(getV("Define"), | |
108 includes, | |
109 get("OutputDir"))); | |
110 | |
111 put("CompilerFlags", compilerFlags); | |
112 } | |
113 | |
114 protected void initDefaultLinkerFlags() { | |
115 Vector linkerFlags = new Vector(); | |
116 | |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
117 linkerFlags.addAll(getCI().getBaseLinkerFlags( get("OutputDir"), get("OutputDll"), get("PlatformName"))); |
0 | 118 |
119 put("LinkerFlags", linkerFlags); | |
120 } | |
121 | |
122 DirectoryTree getSourceTree(String sourceBase, String startAt) { | |
123 DirectoryTree tree = new DirectoryTree(); | |
124 | |
125 tree.addSubdirToIgnore("Codemgr_wsdata"); | |
126 tree.addSubdirToIgnore("deleted_files"); | |
127 tree.addSubdirToIgnore("SCCS"); | |
128 if (startAt != null) { | |
129 tree.readDirectory(sourceBase + File.separator + startAt); | |
130 } else { | |
131 tree.readDirectory(sourceBase); | |
132 } | |
133 | |
134 return tree; | |
135 } | |
136 | |
137 | |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
138 Vector getPreferredPaths() { |
0 | 139 Vector preferredPaths = new Vector(); |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
140 |
0 | 141 // In the case of multiple files with the same name in |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
142 // different subdirectories, prefer these versions |
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
143 preferredPaths.add("windows"); |
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
144 preferredPaths.add("x86"); |
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
145 preferredPaths.add("closed"); |
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
146 |
0 | 147 // Also prefer "opto" over "adlc" for adlcVMDeps.hpp |
148 preferredPaths.add("opto"); | |
149 | |
150 return preferredPaths; | |
151 } | |
152 | |
153 | |
1972 | 154 void handleDB() { |
0 | 155 WinGammaPlatform platform = (WinGammaPlatform)getField(null, "PlatformObject"); |
156 | |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
157 putSpecificField("AllFilesHash", computeAllFiles(platform)); |
0 | 158 } |
159 | |
160 | |
1972 | 161 private boolean matchesIgnoredPath(String prefixedName) { |
162 Vector rv = new Vector(); | |
163 collectRelevantVectors(rv, "IgnorePath"); | |
164 for (Iterator i = rv.iterator(); i.hasNext(); ) { | |
165 String pathPart = (String) i.next(); | |
166 if (prefixedName.contains(Util.normalize(pathPart))) { | |
167 return true; | |
168 } | |
169 } | |
170 return false; | |
171 } | |
172 | |
0 | 173 void addAll(Iterator i, Hashtable hash, |
174 WinGammaPlatform platform, DirectoryTree tree, | |
175 Vector preferredPaths, Vector filesNotFound, Vector filesDuplicate) { | |
176 for (; i.hasNext(); ) { | |
177 String fileName = (String) i.next(); | |
178 if (lookupHashFieldInContext("IgnoreFile", fileName) == null) { | |
179 String prefixedName = platform.envVarPrefixedFileName(fileName, | |
180 0, /* ignored */ | |
181 tree, | |
182 preferredPaths, | |
183 filesNotFound, | |
184 filesDuplicate); | |
185 if (prefixedName != null) { | |
1972 | 186 prefixedName = Util.normalize(prefixedName); |
187 if (!matchesIgnoredPath(prefixedName)) { | |
188 addTo(hash, prefixedName, fileName); | |
189 } | |
0 | 190 } |
191 } | |
192 } | |
193 } | |
194 | |
195 void addTo(Hashtable ht, String key, String value) { | |
196 ht.put(expandFormat(key), expandFormat(value)); | |
197 } | |
198 | |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
199 Hashtable computeAllFiles(WinGammaPlatform platform) { |
0 | 200 Hashtable rv = new Hashtable(); |
201 DirectoryTree tree = getSourceTree(get("SourceBase"), getFieldString(null, "StartAt")); | |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
202 Vector preferredPaths = getPreferredPaths(); |
0 | 203 |
204 // Hold errors until end | |
205 Vector filesNotFound = new Vector(); | |
206 Vector filesDuplicate = new Vector(); | |
207 | |
1972 | 208 Vector includedFiles = new Vector(); |
0 | 209 |
210 // find all files | |
1972 | 211 Vector dirs = getSourceIncludes(); |
212 for (Iterator i = dirs.iterator(); i.hasNext(); ) { | |
213 String dir = (String)i.next(); | |
214 DirectoryTree subtree = getSourceTree(dir, null); | |
215 for (Iterator fi = subtree.getFileIterator(); fi.hasNext(); ) { | |
216 String name = ((File)fi.next()).getName(); | |
217 includedFiles.add(name); | |
218 } | |
0 | 219 } |
1972 | 220 addAll(includedFiles.iterator(), rv, |
0 | 221 platform, tree, |
222 preferredPaths, filesNotFound, filesDuplicate); | |
223 | |
224 Vector addFiles = new Vector(); | |
225 collectRelevantVectors(addFiles, "AdditionalFile"); | |
226 addAll(addFiles.iterator(), rv, | |
227 platform, tree, | |
228 preferredPaths, filesNotFound, filesDuplicate); | |
229 | |
230 collectRelevantHashes(rv, "AdditionalGeneratedFile"); | |
231 | |
232 if ((filesNotFound.size() != 0) || | |
233 (filesDuplicate.size() != 0)) { | |
234 System.err.println("Error: some files were not found or " + | |
235 "appeared in multiple subdirectories of " + | |
236 "directory " + get("SourceBase") + " and could not " + | |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
237 "be resolved with os_family and arch."); |
0 | 238 if (filesNotFound.size() != 0) { |
239 System.err.println("Files not found:"); | |
240 for (Iterator iter = filesNotFound.iterator(); | |
241 iter.hasNext(); ) { | |
242 System.err.println(" " + (String) iter.next()); | |
243 } | |
244 } | |
245 if (filesDuplicate.size() != 0) { | |
246 System.err.println("Duplicate files:"); | |
247 for (Iterator iter = filesDuplicate.iterator(); | |
248 iter.hasNext(); ) { | |
249 System.err.println(" " + (String) iter.next()); | |
250 } | |
251 } | |
252 throw new RuntimeException(); | |
253 } | |
254 | |
255 return rv; | |
256 } | |
257 | |
258 void initDefaultDefines(Vector defines) { | |
259 Vector sysDefines = new Vector(); | |
2184
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
260 |
2273 | 261 if( vars.get("PlatformName").equals("Win32")) { |
2184
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
262 sysDefines.add("WIN32"); |
1408
0ba67bb5392c
added c1x build directory, added MSVC Win64 project support
lstadler
parents:
844
diff
changeset
|
263 } else { |
2184
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
264 sysDefines.add("_AMD64_"); |
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
265 sysDefines.add("AMD64"); |
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
266 sysDefines.add("_WIN64"); |
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
267 sysDefines.add("_LP64"); |
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
268 if (System.getenv("MSC_VER") != null) |
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
269 sysDefines.add("MSC_VER=" + System.getenv("MSC_VER")); |
1408
0ba67bb5392c
added c1x build directory, added MSVC Win64 project support
lstadler
parents:
844
diff
changeset
|
270 sysDefines.add("HOTSPOT_LIB_ARCH=\\\"amd64\\\""); |
0ba67bb5392c
added c1x build directory, added MSVC Win64 project support
lstadler
parents:
844
diff
changeset
|
271 } |
2184
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
272 |
0 | 273 sysDefines.add("_WINDOWS"); |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
274 sysDefines.add("HOTSPOT_BUILD_USER=\\\""+System.getProperty("user.name")+"\\\""); |
0 | 275 sysDefines.add("HOTSPOT_BUILD_TARGET=\\\""+get("Build")+"\\\""); |
276 sysDefines.add("_JNI_IMPLEMENTATION_"); | |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
277 if (vars.get("PlatformName").equals("Win32")) { |
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
278 sysDefines.add("HOTSPOT_LIB_ARCH=\\\"i386\\\""); |
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
279 } else { |
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
280 sysDefines.add("HOTSPOT_LIB_ARCH=\\\"amd64\\\""); |
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
281 } |
0 | 282 |
283 sysDefines.addAll(defines); | |
284 | |
285 put("Define", sysDefines); | |
286 } | |
287 | |
288 String get(String key) { | |
289 return (String)vars.get(key); | |
290 } | |
291 | |
292 Vector getV(String key) { | |
293 return (Vector)vars.get(key); | |
294 } | |
295 | |
296 Object getO(String key) { | |
297 return vars.get(key); | |
298 } | |
299 | |
300 Hashtable getH(String key) { | |
301 return (Hashtable)vars.get(key); | |
302 } | |
303 | |
304 Object getFieldInContext(String field) { | |
305 for (int i=0; i<context.length; i++) { | |
306 Object rv = getField(context[i], field); | |
307 if (rv != null) { | |
308 return rv; | |
309 } | |
310 } | |
311 return null; | |
312 } | |
313 | |
314 Object lookupHashFieldInContext(String field, String key) { | |
315 for (int i=0; i<context.length; i++) { | |
316 Hashtable ht = (Hashtable)getField(context[i], field); | |
317 if (ht != null) { | |
318 Object rv = ht.get(key); | |
319 if (rv != null) { | |
320 return rv; | |
321 } | |
322 } | |
323 } | |
324 return null; | |
325 } | |
326 | |
327 void put(String key, String value) { | |
328 vars.put(key, value); | |
329 } | |
330 | |
331 void put(String key, Vector vvalue) { | |
332 vars.put(key, vvalue); | |
333 } | |
334 | |
335 void add(String key, Vector vvalue) { | |
336 getV(key).addAll(vvalue); | |
337 } | |
338 | |
339 String flavour() { | |
340 return get("Flavour"); | |
341 } | |
342 | |
343 String build() { | |
344 return get("Build"); | |
345 } | |
346 | |
2184
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
347 String outputDir() { |
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
348 return get("OutputDir"); |
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
349 } |
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
350 |
0 | 351 Object getSpecificField(String field) { |
352 return getField(get("Id"), field); | |
353 } | |
354 | |
355 void putSpecificField(String field, Object value) { | |
356 putField(get("Id"), field, value); | |
357 } | |
358 | |
359 void collectRelevantVectors(Vector rv, String field) { | |
360 for (int i = 0; i < context.length; i++) { | |
361 Vector v = getFieldVector(context[i], field); | |
362 if (v != null) { | |
363 for (Iterator j=v.iterator(); j.hasNext(); ) { | |
364 String val = (String)j.next(); | |
365 rv.add(expandFormat(val)); | |
366 } | |
367 } | |
368 } | |
369 } | |
370 | |
371 void collectRelevantHashes(Hashtable rv, String field) { | |
372 for (int i = 0; i < context.length; i++) { | |
373 Hashtable v = (Hashtable)getField(context[i], field); | |
374 if (v != null) { | |
375 for (Enumeration e=v.keys(); e.hasMoreElements(); ) { | |
376 String key = (String)e.nextElement(); | |
377 String val = (String)v.get(key); | |
378 addTo(rv, key, val); | |
379 } | |
380 } | |
381 } | |
382 } | |
383 | |
384 | |
385 Vector getDefines() { | |
386 Vector rv = new Vector(); | |
387 collectRelevantVectors(rv, "Define"); | |
388 return rv; | |
389 } | |
390 | |
391 Vector getIncludes() { | |
392 Vector rv = new Vector(); | |
393 | |
394 collectRelevantVectors(rv, "AbsoluteInclude"); | |
395 | |
1972 | 396 rv.addAll(getSourceIncludes()); |
397 | |
398 return rv; | |
399 } | |
400 | |
401 private Vector getSourceIncludes() { | |
402 Vector rv = new Vector(); | |
0 | 403 Vector ri = new Vector(); |
404 String sourceBase = getFieldString(null, "SourceBase"); | |
405 collectRelevantVectors(ri, "RelativeInclude"); | |
406 for (Iterator i = ri.iterator(); i.hasNext(); ) { | |
407 String f = (String)i.next(); | |
408 rv.add(sourceBase + Util.sep + f); | |
409 } | |
410 return rv; | |
411 } | |
412 | |
413 static Hashtable cfgData = new Hashtable(); | |
414 static Hashtable globalData = new Hashtable(); | |
415 | |
416 static boolean appliesToTieredBuild(String cfg) { | |
417 return (cfg != null && | |
418 (cfg.startsWith("compiler1") || | |
419 cfg.startsWith("compiler2"))); | |
420 } | |
421 | |
1972 | 422 // Filters out the IgnoreFile and IgnorePaths since they are |
423 // handled specially for tiered builds. | |
0 | 424 static boolean appliesToTieredBuild(String cfg, String key) { |
1972 | 425 return (appliesToTieredBuild(cfg))&& (key != null && !key.startsWith("Ignore")); |
0 | 426 } |
427 | |
428 static String getTieredBuildCfg(String cfg) { | |
429 assert appliesToTieredBuild(cfg) : "illegal configuration " + cfg; | |
430 return "tiered" + cfg.substring(9); | |
431 } | |
432 | |
433 static Object getField(String cfg, String field) { | |
434 if (cfg == null) { | |
435 return globalData.get(field); | |
436 } | |
437 | |
438 Hashtable ht = (Hashtable)cfgData.get(cfg); | |
439 return ht == null ? null : ht.get(field); | |
440 } | |
441 | |
442 static String getFieldString(String cfg, String field) { | |
443 return (String)getField(cfg, field); | |
444 } | |
445 | |
446 static Vector getFieldVector(String cfg, String field) { | |
447 return (Vector)getField(cfg, field); | |
448 } | |
449 | |
450 static void putField(String cfg, String field, Object value) { | |
451 putFieldImpl(cfg, field, value); | |
452 if (appliesToTieredBuild(cfg, field)) { | |
453 putFieldImpl(getTieredBuildCfg(cfg), field, value); | |
454 } | |
455 } | |
456 | |
457 private static void putFieldImpl(String cfg, String field, Object value) { | |
458 if (cfg == null) { | |
459 globalData.put(field, value); | |
460 return; | |
461 } | |
462 | |
463 Hashtable ht = (Hashtable)cfgData.get(cfg); | |
464 if (ht == null) { | |
465 ht = new Hashtable(); | |
466 cfgData.put(cfg, ht); | |
467 } | |
468 | |
469 ht.put(field, value); | |
470 } | |
471 | |
472 static Object getFieldHash(String cfg, String field, String name) { | |
473 Hashtable ht = (Hashtable)getField(cfg, field); | |
474 | |
475 return ht == null ? null : ht.get(name); | |
476 } | |
477 | |
478 static void putFieldHash(String cfg, String field, String name, Object val) { | |
479 putFieldHashImpl(cfg, field, name, val); | |
1972 | 480 if (appliesToTieredBuild(cfg, field)) { |
0 | 481 putFieldHashImpl(getTieredBuildCfg(cfg), field, name, val); |
482 } | |
483 } | |
484 | |
485 private static void putFieldHashImpl(String cfg, String field, String name, Object val) { | |
486 Hashtable ht = (Hashtable)getField(cfg, field); | |
487 | |
488 if (ht == null) { | |
489 ht = new Hashtable(); | |
490 putFieldImpl(cfg, field, ht); | |
491 } | |
492 | |
493 ht.put(name, val); | |
494 } | |
495 | |
496 static void addFieldVector(String cfg, String field, String element) { | |
497 addFieldVectorImpl(cfg, field, element); | |
1972 | 498 if (appliesToTieredBuild(cfg, field)) { |
0 | 499 addFieldVectorImpl(getTieredBuildCfg(cfg), field, element); |
500 } | |
501 } | |
502 | |
503 private static void addFieldVectorImpl(String cfg, String field, String element) { | |
504 Vector v = (Vector)getField(cfg, field); | |
505 | |
506 if (v == null) { | |
507 v = new Vector(); | |
508 putFieldImpl(cfg, field, v); | |
509 } | |
510 | |
511 v.add(element); | |
512 } | |
513 | |
514 String expandFormat(String format) { | |
515 if (format == null) { | |
516 return null; | |
517 } | |
518 | |
519 if (format.indexOf('%') == -1) { | |
520 return format; | |
521 } | |
522 | |
523 StringBuffer sb = new StringBuffer(); | |
524 int len = format.length(); | |
525 for (int i=0; i<len; i++) { | |
526 char ch = format.charAt(i); | |
527 if (ch == '%') { | |
528 char ch1 = format.charAt(i+1); | |
529 switch (ch1) { | |
530 case '%': | |
531 sb.append(ch1); | |
532 break; | |
533 case 'b': | |
534 sb.append(build()); | |
535 break; | |
536 case 'f': | |
537 sb.append(flavour()); | |
538 break; | |
2184
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
539 case 'o': |
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
540 sb.append(outputDir()); |
5d801e6b9a80
Imported build system changes from other repository.
Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
parents:
2044
diff
changeset
|
541 break; |
0 | 542 default: |
543 sb.append(ch); | |
544 sb.append(ch1); | |
545 } | |
546 i++; | |
547 } else { | |
548 sb.append(ch); | |
549 } | |
550 } | |
551 | |
552 return sb.toString(); | |
553 } | |
554 } | |
555 | |
556 abstract class GenericDebugConfig extends BuildConfig { | |
557 abstract String getOptFlag(); | |
558 | |
559 protected void init(Vector includes, Vector defines) { | |
560 defines.add("_DEBUG"); | |
561 defines.add("ASSERT"); | |
562 | |
563 super.init(includes, defines); | |
564 | |
565 getV("CompilerFlags").addAll(getCI().getDebugCompilerFlags(getOptFlag())); | |
566 getV("LinkerFlags").addAll(getCI().getDebugLinkerFlags()); | |
567 } | |
568 } | |
569 | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
570 abstract class GenericDebugNonKernelConfig extends GenericDebugConfig { |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
571 protected void init(Vector includes, Vector defines) { |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
572 super.init(includes, defines); |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
573 getCI().getAdditionalNonKernelLinkerFlags(getV("LinkerFlags")); |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
574 } |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
575 } |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
576 |
4572
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
577 class GraalDebugConfig extends GenericDebugNonKernelConfig { |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
578 String getOptFlag() { |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
579 return getCI().getNoOptFlag(); |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
580 } |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
581 |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
582 GraalDebugConfig() { |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
583 initNames("graal", "debug", "jvm.dll"); |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
584 init(getIncludes(), getDefines()); |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
585 } |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
586 } |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
587 |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
588 class GraalFastDebugConfig extends GenericDebugNonKernelConfig { |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
589 String getOptFlag() { |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
590 return getCI().getOptFlag(); |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
591 } |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
592 |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
593 GraalFastDebugConfig() { |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
594 initNames("graal", "fastdebug", "jvm.dll"); |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
595 init(getIncludes(), getDefines()); |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
596 } |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
597 } |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
598 |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
599 class C1DebugConfig extends GenericDebugNonKernelConfig { |
0 | 600 String getOptFlag() { |
601 return getCI().getNoOptFlag(); | |
602 } | |
603 | |
604 C1DebugConfig() { | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
605 initNames("compiler1", "debug", "jvm.dll"); |
0 | 606 init(getIncludes(), getDefines()); |
607 } | |
608 } | |
609 | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
610 class C1FastDebugConfig extends GenericDebugNonKernelConfig { |
0 | 611 String getOptFlag() { |
612 return getCI().getOptFlag(); | |
613 } | |
614 | |
615 C1FastDebugConfig() { | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
616 initNames("compiler1", "fastdebug", "jvm.dll"); |
0 | 617 init(getIncludes(), getDefines()); |
618 } | |
619 } | |
620 | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
621 class C2DebugConfig extends GenericDebugNonKernelConfig { |
0 | 622 String getOptFlag() { |
623 return getCI().getNoOptFlag(); | |
624 } | |
625 | |
626 C2DebugConfig() { | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
627 initNames("compiler2", "debug", "jvm.dll"); |
0 | 628 init(getIncludes(), getDefines()); |
629 } | |
630 } | |
631 | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
632 class C2FastDebugConfig extends GenericDebugNonKernelConfig { |
0 | 633 String getOptFlag() { |
634 return getCI().getOptFlag(); | |
635 } | |
636 | |
637 C2FastDebugConfig() { | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
638 initNames("compiler2", "fastdebug", "jvm.dll"); |
0 | 639 init(getIncludes(), getDefines()); |
640 } | |
641 } | |
642 | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
643 class TieredDebugConfig extends GenericDebugNonKernelConfig { |
0 | 644 String getOptFlag() { |
645 return getCI().getNoOptFlag(); | |
646 } | |
647 | |
648 TieredDebugConfig() { | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
649 initNames("tiered", "debug", "jvm.dll"); |
0 | 650 init(getIncludes(), getDefines()); |
651 } | |
652 } | |
653 | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
654 class TieredFastDebugConfig extends GenericDebugNonKernelConfig { |
0 | 655 String getOptFlag() { |
656 return getCI().getOptFlag(); | |
657 } | |
658 | |
659 TieredFastDebugConfig() { | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
660 initNames("tiered", "fastdebug", "jvm.dll"); |
0 | 661 init(getIncludes(), getDefines()); |
662 } | |
663 } | |
664 | |
665 | |
666 abstract class ProductConfig extends BuildConfig { | |
667 protected void init(Vector includes, Vector defines) { | |
668 defines.add("NDEBUG"); | |
669 defines.add("PRODUCT"); | |
670 | |
671 super.init(includes, defines); | |
672 | |
673 getV("CompilerFlags").addAll(getCI().getProductCompilerFlags()); | |
674 getV("LinkerFlags").addAll(getCI().getProductLinkerFlags()); | |
675 } | |
676 } | |
677 | |
4572
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
678 class GraalProductConfig extends ProductConfig { |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
679 GraalProductConfig() { |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
680 initNames("graal", "product", "jvm.dll"); |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
681 init(getIncludes(), getDefines()); |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
682 } |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
683 } |
76841bdd5f3e
(Windows) Add Graal build configurations (with GRAAL defined) and fix build command.
Andreas Woess <andreas.woess@jku.at>
parents:
4475
diff
changeset
|
684 |
0 | 685 class C1ProductConfig extends ProductConfig { |
686 C1ProductConfig() { | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
687 initNames("compiler1", "product", "jvm.dll"); |
0 | 688 init(getIncludes(), getDefines()); |
689 } | |
690 } | |
691 | |
692 class C2ProductConfig extends ProductConfig { | |
693 C2ProductConfig() { | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
694 initNames("compiler2", "product", "jvm.dll"); |
0 | 695 init(getIncludes(), getDefines()); |
696 } | |
697 } | |
698 | |
699 class TieredProductConfig extends ProductConfig { | |
700 TieredProductConfig() { | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
701 initNames("tiered", "product", "jvm.dll"); |
0 | 702 init(getIncludes(), getDefines()); |
703 } | |
704 } | |
705 | |
706 | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
707 class CoreDebugConfig extends GenericDebugNonKernelConfig { |
0 | 708 String getOptFlag() { |
709 return getCI().getNoOptFlag(); | |
710 } | |
711 | |
712 CoreDebugConfig() { | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
713 initNames("core", "debug", "jvm.dll"); |
0 | 714 init(getIncludes(), getDefines()); |
715 } | |
716 } | |
717 | |
718 | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
719 class CoreFastDebugConfig extends GenericDebugNonKernelConfig { |
0 | 720 String getOptFlag() { |
721 return getCI().getOptFlag(); | |
722 } | |
723 | |
724 CoreFastDebugConfig() { | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
725 initNames("core", "fastdebug", "jvm.dll"); |
0 | 726 init(getIncludes(), getDefines()); |
727 } | |
728 } | |
729 | |
730 | |
731 class CoreProductConfig extends ProductConfig { | |
732 CoreProductConfig() { | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
733 initNames("core", "product", "jvm.dll"); |
0 | 734 init(getIncludes(), getDefines()); |
735 } | |
736 } | |
737 | |
738 class KernelDebugConfig extends GenericDebugConfig { | |
739 String getOptFlag() { | |
740 return getCI().getNoOptFlag(); | |
741 } | |
742 | |
743 KernelDebugConfig() { | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
744 initNames("kernel", "debug", "jvm.dll"); |
0 | 745 init(getIncludes(), getDefines()); |
746 } | |
747 } | |
748 | |
749 | |
750 class KernelFastDebugConfig extends GenericDebugConfig { | |
751 String getOptFlag() { | |
752 return getCI().getOptFlag(); | |
753 } | |
754 | |
755 KernelFastDebugConfig() { | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
756 initNames("kernel", "fastdebug", "jvm.dll"); |
0 | 757 init(getIncludes(), getDefines()); |
758 } | |
759 } | |
760 | |
761 | |
762 class KernelProductConfig extends ProductConfig { | |
763 KernelProductConfig() { | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
764 initNames("kernel", "product", "jvm.dll"); |
0 | 765 init(getIncludes(), getDefines()); |
766 } | |
767 } | |
768 abstract class CompilerInterface { | |
769 abstract Vector getBaseCompilerFlags(Vector defines, Vector includes, String outDir); | |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
770 abstract Vector getBaseLinkerFlags(String outDir, String outDll, String platformName); |
0 | 771 abstract Vector getDebugCompilerFlags(String opt); |
772 abstract Vector getDebugLinkerFlags(); | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
773 abstract void getAdditionalNonKernelLinkerFlags(Vector rv); |
0 | 774 abstract Vector getProductCompilerFlags(); |
775 abstract Vector getProductLinkerFlags(); | |
776 abstract String getOptFlag(); | |
777 abstract String getNoOptFlag(); | |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
2027
diff
changeset
|
778 abstract String makeCfgName(String flavourBuild, String platformName); |
0 | 779 |
780 void addAttr(Vector receiver, String attr, String value) { | |
781 receiver.add(attr); receiver.add(value); | |
782 } | |
2027
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
783 void extAttr(Vector receiver, String attr, String value) { |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
784 int attr_pos=receiver.indexOf(attr) ; |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
785 if ( attr_pos == -1) { |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
786 // If attr IS NOT present in the Vector - add it |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
787 receiver.add(attr); receiver.add(value); |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
788 } else { |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
789 // If attr IS present in the Vector - append value to it |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
790 receiver.set(attr_pos+1,receiver.get(attr_pos+1)+value); |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
791 } |
aa6e219afbf1
7006354: Updates to Visual Studio project creation and development launcher
sla
parents:
1972
diff
changeset
|
792 } |
0 | 793 } |