pnever 2004/09/23 09:50:51
Modified: proposals/tamino/etc/ant globals.xml
proposals/tamino/src/store/org/apache/slide/store/tamino/tools
Tws.java
Log:
Solaris 64-bit
Revision Changes Path
1.3 +3 -0 jakarta-slide/proposals/tamino/etc/ant/globals.xml
Index: globals.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/proposals/tamino/etc/ant/globals.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- globals.xml 15 Sep 2004 16:46:10 -0000 1.2
+++ globals.xml 23 Sep 2004 16:50:49 -0000 1.3
@@ -12,6 +12,9 @@
<!-- used by slide target and cg generation -->
<property name="slide.home" location="${basedir}/../.."/>
+<!-- SOLARIS ONLY: -d64 if 64-bit applications are supported, "" else -->
+<property name="jvmopt.d64" value=""/>
+
<property name="tws.home" location="${basedir}"/>
<property name="tws.version" value="4.2.2.0"/>
<property name="tws.src" location="${tws.home}/src"/>
1.3 +18 -26
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/Tws.java
Index: Tws.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/Tws.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Tws.java 23 Sep 2004 13:40:01 -0000 1.2
+++ Tws.java 23 Sep 2004 16:50:51 -0000 1.3
@@ -260,40 +260,32 @@
//--
public static void main(String[] args) throws IOException {
- Tws[] tools;
- int i;
- File dir;
- File props;
- File jar;
- String nativeLib;
- Generator g;
- Properties env;
- String vmOpts;
-
- if (args.length != 4) {
- throw new IOException("illegal arguments, expected: dir properties jar
vmargs nativeLib");
+ if (args.length < 4 || args.length > 5) {
+ throw new IOException("illegal arguments, expected: dir properties jar
vmargs nativeLib (jvmopt.d64)");
}
- dir = new File(args[0]).getAbsoluteFile();
+ File dir = new File(args[0]).getAbsoluteFile();
if (!dir.isDirectory()) {
throw new IOException("directory not found: " + dir);
}
- props = new File(args[1]).getAbsoluteFile();
+ File props = new File(args[1]).getAbsoluteFile();
if (!props.isFile()) {
throw new IOException("launcher properties not found: " + props);
}
- jar = new File(args[2]);
+ File jar = new File(args[2]);
if (!jar.isFile()) {
throw new IOException("jar not found: " + jar);
}
+ String nativeLib = args[3];
+ String jvmopt_d64 = "";
+ if (args.length == 5 && args[4].length() > 0) {
+ jvmopt_d64 = args[4];
+ }
- nativeLib = args[3];
- String jvmopt_d64 = args[4];
-
- tools = createTools();
- env = new Properties();
- for (i = 0; i < tools.length; i++) {
- vmOpts = jvmopt_d64 + " -Dmain=" + tools[i].getClass().getName();
- g = new Generator(dir, PREFIX + tools[i].name, props, jar, env, vmOpts,
nativeLib);
+ Tws[] tools = createTools();
+ Properties env = new Properties();
+ for (int i = 0; i < tools.length; i++) {
+ String vmOpts = jvmopt_d64 + " -Dmain=" + tools[i].getClass().getName();
+ Generator g = new Generator(dir, PREFIX + tools[i].name, props, jar,
env, vmOpts, nativeLib);
g.run();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
