Changeset 887

Timestamp:

Dec 5, 2008, 5:45:56 PM (14 years ago)

Author:

Jari Häkkinen

Message:

Fixes #154. configure now supports setting of java source files encoding.

Location:

plugins/base1/se.lu.thep.wenni/trunk

Files:

• INSTALL (modified) (4 diffs)
• configure.ac (modified) (2 diffs)

plugins/base1/se.lu.thep.wenni/trunk/INSTALL

@@ -161 +161 @@
     directory `www`.
     [[br]] [[br]]
-    ''Some notes on configure options:'' The configure script accepts
+    ''Some notes on configure options:''
+    [[br]] [[br]]
+    The configure script accepts
     a few options that may be of interest. You can provide
     `./configure` with BASE2 location information with
@@ -169 +171 @@
     `--with-plugindir=DIR`. Files will be installed in
     `<DIR>`. Default `DIR` is set to
-    `<BASEDIR>/plugins/se/lu/thep/wenni/`. You may use `with-gsl=DIR`
+    `<BASEDIR>/plugins/se/lu/thep/wenni/`.
+    [[br]] [[br]]
+    You may use `with-gsl=DIR`
     to provide information on GSL location. The option `enable-debug`
     turns on debug options on the compilation of binary `nni`
     (e.g. enables assertions).
+    [[br]] [[br]]
+    The Java compiler sometimes fails to recognize the character
+    encoding of the source files. Use
+    `--with-javasourceencoding=coding` to set the encoding of source
+    files. You can find available encodings by doing `man javac`.
 
  3. Now build using
@@ -264 +273 @@
     `/path/to/wenni/BASE-plugindevkit/bogus-base`
     [[br]] [[br]]
-    ''Some notes on configure options:'' The configure script accepts
+    ''Some notes on configure options:''
+    [[br]] [[br]]
+    The configure script accepts
     a few options that may be of interest. You generally must provide
     `./configure` with BASE1 location information with
@@ -352 +363 @@
     $ ./configure  --enable-state=stand-alone
     }}}
-    ''Some notes on configure options:'' Do `./configure --help` for
+    ''Some notes on configure options:''
+    [[br]] [[br]]
+    Do `./configure --help` for
     details in available options. You may use `with-gsl=DIR` to
     provide information on GSL location. The option `enable-debug`

plugins/base1/se.lu.thep.wenni/trunk/configure.ac

@@ -112 +112 @@
              fi])
 AC_SUBST(PLUGINDIR)
+
+AC_ARG_WITH(javasourceencoding,
+            [AS_HELP_STRING([--with-javasourceencoding=ARG],
+                            [Use ARG as Java source file character encoding [default=UTF8]])],
+            [JAVASRCENCODING=$withval],[JAVASRCENCODING=UTF8])
 
 if (test x$state = xbase1); then
@@ -134 +139 @@
   AC_PROG_JAVAC   
   AC_PROG_JAR   
-  JAVACFLAGS="-encoding UTF8"
+  JAVACFLAGS="-encoding $JAVASRCENCODING"
   JAVACCLASSPATH="\$(builddir)"
   if (test $DOWNLOADBASE2API = false); then