You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by pi...@apache.org on 2002/07/14 17:23:47 UTC
cvs commit: xml-fop/src/org/apache/fop/apps CommandLineOptions.java CommandLineStarter.java Driver.java
pietsch 2002/07/14 08:23:47
Modified: . build.sh
src/org/apache/fop/apps CommandLineOptions.java
CommandLineStarter.java Driver.java
Log:
Removed traces of buffermanager
A few cosmetical changes in CommandLineOptions
Revision Changes Path
1.19 +19 -0 xml-fop/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-fop/build.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.sh 28 Jun 2002 07:52:51 -0000 1.18
+++ build.sh 14 Jul 2002 15:23:47 -0000 1.19
@@ -12,11 +12,30 @@
echo "location of the Java Virtual Machine you want to use."
exit 1
fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
LIBDIR=lib
LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.4.3.jar:$LIBDIR/xalan-2.3.1.jar:$LIBDIR/xml-apis.jar
LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/avalon-framework-cvs-20020315.jar
ANT_HOME=$LIBDIR
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
+fi
echo
echo Building with classpath $LOCALCLASSPATH
1.17 +15 -42 xml-fop/src/org/apache/fop/apps/CommandLineOptions.java
Index: CommandLineOptions.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLineOptions.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- CommandLineOptions.java 11 Apr 2002 09:33:26 -0000 1.16
+++ CommandLineOptions.java 14 Jul 2002 15:23:47 -0000 1.17
@@ -49,39 +49,31 @@
private static final int TXT_OUTPUT = 7;
/* output: svg file */
private static final int SVG_OUTPUT = 8;
-
- /* System buffers */
- private static final int BUFFER_FILE = 8;
-
- /* System buffers */
+ /* output: XML area tree */
private static final int AREA_OUTPUT = 9;
/* use debug mode */
- Boolean errorDump = new Boolean(false);
+ Boolean errorDump = Boolean.FALSE;
/* show configuration information */
- Boolean dumpConfiguration = new Boolean(false);
+ Boolean dumpConfiguration = Boolean.FALSE;
/* suppress any progress information */
- Boolean quiet = new Boolean(false);
+ Boolean quiet = Boolean.FALSE;
/* for area tree XML output, only down to block area level */
- Boolean suppressLowLevelAreas = new Boolean(false);
- /* name of user configuration file */
+ Boolean suppressLowLevelAreas = Boolean.FALSE;
+ /* user configuration file */
File userConfigFile = null;
- /* name of input fo file */
+ /* input fo file */
File fofile = null;
- /* name of xsltfile (xslt transformation as input) */
+ /* xsltfile (xslt transformation as input) */
File xsltfile = null;
- /* name of xml file (xslt transformation as input) */
+ /* xml file (xslt transformation as input) */
File xmlfile = null;
- /* name of output file */
+ /* output file */
File outfile = null;
- /* name of buffer file */
- File bufferFile = null;
/* input mode */
int inputmode = NOT_SET;
/* output mode */
int outputmode = NOT_SET;
- /* buffer mode */
- int buffermode = NOT_SET;
/* language for user information */
String language = null;
@@ -122,13 +114,13 @@
private boolean parseOptions(String args[]) throws FOPException {
for (int i = 0; i < args.length; i++) {
if (args[i].equals("-d") || args[i].equals("--full-error-dump")) {
- errorDump = new Boolean(true);
+ errorDump = Boolean.TRUE;
log = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG);
} else if (args[i].equals("-x")
|| args[i].equals("--dump-config")) {
- dumpConfiguration = new Boolean(true);
+ dumpConfiguration = Boolean.TRUE;
} else if (args[i].equals("-q") || args[i].equals("--quiet")) {
- quiet = new Boolean(true);
+ quiet = Boolean.TRUE;
log = new ConsoleLogger(ConsoleLogger.LEVEL_ERROR);
} else if (args[i].equals("-c")) {
if ((i + 1 == args.length)
@@ -147,7 +139,7 @@
i++;
}
} else if (args[i].equals("-s")) {
- suppressLowLevelAreas = new Boolean(true);
+ suppressLowLevelAreas = Boolean.TRUE;
} else if (args[i].equals("-fo")) {
inputmode = FO_INPUT;
if ((i + 1 == args.length)
@@ -250,21 +242,6 @@
throw new FOPException("Don't know what to do with "
+ args[i]);
}
- } else if (args[i].equals("-buf")) {
- if (buffermode == NOT_SET) {
- buffermode = BUFFER_FILE;
- } else {
- log.error("you can only set one buffer method");
- printUsage();
- }
- if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
- log.error("you must specify the buffer output file");
- printUsage();
- } else {
- bufferFile = new File(args[i + 1]);
- i++;
- }
} else if (args[i].equals("-at")) {
setOutputMode(AREA_OUTPUT);
if ((i + 1 == args.length)
@@ -465,10 +442,6 @@
public String getLanguage() {
return language;
- }
-
- public File getBufferFile() {
- return bufferFile;
}
public Boolean isQuiet() {
1.17 +1 -2 xml-fop/src/org/apache/fop/apps/CommandLineStarter.java
Index: CommandLineStarter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLineStarter.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- CommandLineStarter.java 5 Jun 2002 14:52:27 -0000 1.16
+++ CommandLineStarter.java 14 Jul 2002 15:23:47 -0000 1.17
@@ -54,7 +54,6 @@
Driver driver = new Driver();
driver.setLogger(log);
- driver.setBufferFile(commandLineOptions.getBufferFile());
driver.initialize();
if (errorDump) {
1.51 +1 -6 xml-fop/src/org/apache/fop/apps/Driver.java
Index: Driver.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Driver.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- Driver.java 20 Jun 2002 09:14:11 -0000 1.50
+++ Driver.java 14 Jul 2002 15:23:47 -0000 1.51
@@ -528,11 +528,6 @@
}
}
- /* Set up the system buffers */
-
- public void setBufferFile(File bufferFile) {
- }
-
/**
* Runs the formatting and renderering process using the previously set
* inputsource and outputstream
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org