From 08dfbf259277c6be4e2309741f934d11368306d0 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Sat, 12 May 2007 00:25:56 +0000 Subject: [PATCH] Implemented a lot of fixes --- extras/java/.classpath | 12 ++++++++++++ extras/java/.project | 17 +++++++++++++++++ extras/java/INSTALL | 4 +--- extras/java/build.xml | 13 +++++-------- extras/java/config.log | 17 +++++++++-------- extras/java/config.status | 4 ++-- extras/java/org.eclipse.jdt.ui.prefs | 3 +++ 7 files changed, 49 insertions(+), 21 deletions(-) diff --git a/extras/java/.classpath b/extras/java/.classpath index 81435344..4d04b87b 100644 --- a/extras/java/.classpath +++ b/extras/java/.classpath @@ -10,3 +10,15 @@ + + + + + + + + + + + + diff --git a/extras/java/.project b/extras/java/.project index f5501eaa..7c79cb5e 100644 --- a/extras/java/.project +++ b/extras/java/.project @@ -15,3 +15,20 @@ org.eclipse.jdt.core.javanature + + + java-libburn + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/extras/java/INSTALL b/extras/java/INSTALL index 7e59f793..8b7a9843 100644 --- a/extras/java/INSTALL +++ b/extras/java/INSTALL @@ -14,9 +14,7 @@ The simplest way to compile this package is: Running `configure' might take a while. While running, it prints some messages telling which features it is checking for. - 2. Type `ant' to compile the package. You need to add the cpptasks.jar to ant - classpath. Usually this can be done by copy that jar into ant lib dir. - cpptasks.jar can be downloaded from http://ant-contrib.sourceforge.net. + 2. Type `ant' to compile the package. 3. Optionally, type `ant check' to run any self-tests that come with the package. diff --git a/extras/java/build.xml b/extras/java/build.xml index e02048bb..41415359 100644 --- a/extras/java/build.xml +++ b/extras/java/build.xml @@ -45,7 +45,7 @@ - + @@ -247,23 +247,20 @@ - + **/build.properties/**, **/.bzr**" /> - + - - - - + diff --git a/extras/java/config.log b/extras/java/config.log index 52c84e05..652d8134 100644 --- a/extras/java/config.log +++ b/extras/java/config.log @@ -12,9 +12,9 @@ generated by GNU Autoconf 2.60. Invocation command line was hostname = mplaptop uname -m = i686 -uname -r = 2.6.20-15-generic +uname -r = 2.6.17-10-generic uname -s = Linux -uname -v = #2 SMP Sun Apr 15 07:36:31 UTC 2007 +uname -v = #2 SMP Fri Oct 13 18:45:35 UTC 2006 /usr/bin/uname -p = unknown /bin/uname -X = unknown @@ -33,6 +33,7 @@ PATH: /usr/sbin PATH: /usr/bin PATH: /sbin PATH: /bin +PATH: /usr/bin/X11 PATH: /usr/games @@ -41,8 +42,8 @@ PATH: /usr/games ## ----------- ## configure:1633: checking for javac -configure:1651: found /usr/bin/javac -configure:1663: result: /usr/bin/javac +configure:1651: found /usr/local/bin/javac +configure:1663: result: /usr/local/bin/javac configure:1673: checking for javah configure:1691: found /usr/bin/javah configure:1703: result: /usr/bin/javah @@ -54,7 +55,7 @@ configure:1816: found /usr/bin/gcc configure:1827: result: gcc configure:2065: checking for C compiler version configure:2072: gcc --version >&5 -gcc (GCC) 4.1.2 (Ubuntu 4.1.2-0ubuntu4) +gcc (GCC) 4.1.2 20060928 (prerelease) (Ubuntu 4.1.1-13ubuntu5) Copyright (C) 2006 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -65,7 +66,7 @@ Using built-in specs. Target: i486-linux-gnu Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-checking=release i486-linux-gnu Thread model: posix -gcc version 4.1.2 (Ubuntu 4.1.2-0ubuntu4) +gcc version 4.1.2 20060928 (prerelease) (Ubuntu 4.1.1-13ubuntu5) configure:2085: $? = 0 configure:2092: gcc -V >&5 gcc: '-V' option must have argument @@ -152,7 +153,7 @@ ac_cv_env_target_alias_set= ac_cv_env_target_alias_value= ac_cv_objext=o ac_cv_path_JAR=/usr/bin/jar -ac_cv_path_JAVAC=/usr/bin/javac +ac_cv_path_JAVAC=/usr/local/bin/javac ac_cv_path_JAVAH=/usr/bin/javah ac_cv_prog_ac_ct_CC=gcc ac_cv_prog_cc_c89= @@ -173,7 +174,7 @@ ECHO_T='' EXEEXT='' ISOFS_INCLUDE='/usr/local/include/libisofs' JAR='/usr/bin/jar' -JAVAC='/usr/bin/javac' +JAVAC='/usr/local/bin/javac' JAVAH='/usr/bin/javah' LDFLAGS='' LIBOBJS='' diff --git a/extras/java/config.status b/extras/java/config.status index ed3e6e88..14574455 100644 --- a/extras/java/config.status +++ b/extras/java/config.status @@ -318,7 +318,7 @@ Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -ac_pwd='extras/java' +ac_pwd='/home/metalpain/Dados/workspace/java-libburn' srcdir='.' # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. @@ -489,7 +489,7 @@ s,@LIBS@,|#_!!_#|,g s,@build_alias@,|#_!!_#|,g s,@host_alias@,|#_!!_#|,g s,@target_alias@,|#_!!_#|,g -s,@JAVAC@,|#_!!_#|/usr/bin/javac,g +s,@JAVAC@,|#_!!_#|/usr/local/bin/javac,g s,@JAVAH@,|#_!!_#|/usr/bin/javah,g s,@JAR@,|#_!!_#|/usr/bin/jar,g s,@CC@,|#_!!_#|gcc,g diff --git a/extras/java/org.eclipse.jdt.ui.prefs b/extras/java/org.eclipse.jdt.ui.prefs index d052711e..9804c75c 100644 --- a/extras/java/org.eclipse.jdt.ui.prefs +++ b/extras/java/org.eclipse.jdt.ui.prefs @@ -1,3 +1,6 @@ #Sat Mar 24 13:41:25 CET 2007 eclipse.preferences.version=1 org.eclipse.jdt.ui.text.custom_code_templates=