This is the mail archive of the frysk@sourceware.org mailing list for the frysk project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Add .jar-s instead of source directories to compile path.]


A heads up.

This tweaks the way the compiler is run so that it is forced to look in .jars for pre-compiled .class files (and not accidently re-compile a .java file). (tks to tromey for figuring out the problem).

With this in place, I'm able to built frysk on f8 with the --enable-jar-compile option. That option enables the "faster" sequence .java->.class->.jar->.o vs the slower .java->.o path. Going forward this option is likely to be made the default.

Andrew



--- Begin Message ---
The branch, master has been updated
       via  78344c59350f0a1b825086acdd677ca6eee6c9bd (commit)
      from  e54b08323e3adc46f40ab8efc2618f7b2da44897 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 78344c59350f0a1b825086acdd677ca6eee6c9bd
Author: Andrew Cagney <cagney@toil.yyz.redhat.com>
Date:   Mon Dec 3 18:29:15 2007 -0500

    Add .jar-s instead of source directories to compile path.
    
    frysk-core/ChangeLog
    2007-12-03  Andrew Cagney  <cagney@redhat.com>
    
    	* Makefile.am (GEN_CLASSPATH): Add frysk-sys.jar.
    	(GEN_SOURCEPATH): Delete frysk-sys/.
    
    frysk-gtk/ChangeLog
    2007-12-03  Andrew Cagney  <cagney@redhat.com>
    
    	* Makefile.am (GEN_CLASSPATH): Add frysk-sys.jar.
    	(GEN_SOURCEPATH): Remove frysk-sys/.
    
    frysk-gui/ChangeLog
    2007-12-03  Andrew Cagney  <cagney@redhat.com>
    
    	* Makefile.am (GEN_CLASSPATH): Add frysk-sys.jar, frysk-core.jar,
    	and frysk-gtk.jar.
    	(GEN_SOURCEPATH): Remove frysk-sys/, frysk-core/, and frysk-gtk/.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/ChangeLog   |    5 +++++
 frysk-core/Makefile.am |    3 +--
 frysk-gtk/ChangeLog    |    5 +++++
 frysk-gtk/Makefile.am  |    3 +--
 frysk-gui/ChangeLog    |    6 ++++++
 frysk-gui/Makefile.am  |    7 +++----
 6 files changed, 21 insertions(+), 8 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/ChangeLog b/frysk-core/ChangeLog
index 4f38c20..b98593d 100644
--- a/frysk-core/ChangeLog
+++ b/frysk-core/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-03  Andrew Cagney  <cagney@redhat.com>
+
+	* Makefile.am (GEN_CLASSPATH): Add frysk-sys.jar.
+	(GEN_SOURCEPATH): Delete frysk-sys/.
+
 2007-12-03  Stan Cox  <scox@redhat.com>
 
 	* Makefile.am (TestTypeEntry.java): Fix dependency.
diff --git a/frysk-core/Makefile.am b/frysk-core/Makefile.am
index 1c22d15..903595c 100644
--- a/frysk-core/Makefile.am
+++ b/frysk-core/Makefile.am
@@ -41,8 +41,7 @@
 include common/Makefile.rules
 include Makefile.gen
 
-GEN_SOURCEPATH += ../frysk-sys/
-GEN_SOURCEPATH += $(top_srcdir)/../frysk-sys/
+GEN_CLASSPATH += ../frysk-sys/frysk-sys.jar
 GEN_CLASSPATH += ../frysk-imports/jline.jar
 GEN_CLASSPATH += ../frysk-imports/antlr.jar
 GEN_CLASSPATH += ../frysk-imports/junit.jar
diff --git a/frysk-gtk/ChangeLog b/frysk-gtk/ChangeLog
index 5da0eaf..42ae527 100644
--- a/frysk-gtk/ChangeLog
+++ b/frysk-gtk/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-03  Andrew Cagney  <cagney@redhat.com>
+
+	* Makefile.am (GEN_CLASSPATH): Add frysk-sys.jar.
+	(GEN_SOURCEPATH): Remove frysk-sys/.
+
 2007-11-26  Andrew Cagney  <cagney@redhat.com>
 
 	* bootstrap.sh: Pass --jni to Makefile.gen.sh.
diff --git a/frysk-gtk/Makefile.am b/frysk-gtk/Makefile.am
index 176dcd6..305a1d7 100644
--- a/frysk-gtk/Makefile.am
+++ b/frysk-gtk/Makefile.am
@@ -42,8 +42,7 @@ include Makefile.gen
 
 SUBDIRS = tlwidgets tests
 
-GEN_SOURCEPATH += ../frysk-sys/ $(top_srcdir)/../frysk-sys/
-
+GEN_CLASSPATH += ../frysk-sys/frysk-sys.jar
 GEN_CLASSPATH += ../frysk-imports/junit.jar 
 GEN_CLASSPATH += ../frysk-imports/getopt.jar
 GEN_CLASSPATH += $(FRYSK_GTK_JARS)
diff --git a/frysk-gui/ChangeLog b/frysk-gui/ChangeLog
index 8461575..cb1dec3 100644
--- a/frysk-gui/ChangeLog
+++ b/frysk-gui/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-03  Andrew Cagney  <cagney@redhat.com>
+
+	* Makefile.am (GEN_CLASSPATH): Add frysk-sys.jar, frysk-core.jar,
+	and frysk-gtk.jar.
+	(GEN_SOURCEPATH): Remove frysk-sys/, frysk-core/, and frysk-gtk/.
+
 2007-11-22  Andrew Cagney  <cagney@redhat.com>
 
 	* configure.ac (GLADE_DTD_FILE): Conditionally set.
diff --git a/frysk-gui/Makefile.am b/frysk-gui/Makefile.am
index 3d2c7aa..ede5438 100644
--- a/frysk-gui/Makefile.am
+++ b/frysk-gui/Makefile.am
@@ -40,10 +40,9 @@
 include common/Makefile.rules
 include Makefile.gen
 
-GEN_SOURCEPATH += ../frysk-gtk/ $(top_srcdir)/../frysk-gtk/
-GEN_SOURCEPATH += ../frysk-core/ $(top_srcdir)/../frysk-core/
-GEN_SOURCEPATH += ../frysk-sys/ $(top_srcdir)/../frysk-sys/
-
+GEN_CLASSPATH += ../frysk-gtk/frysk-gtk.jar
+GEN_CLASSPATH += ../frysk-core/frysk-core.jar
+GEN_CLASSPATH += ../frysk-sys/frysk-sys.jar
 GEN_CLASSPATH += ../frysk-imports/antlr.jar
 GEN_CLASSPATH += ../frysk-imports/jdom.jar
 GEN_CLASSPATH += ../frysk-imports/cdtparser.jar


hooks/post-receive
--
frysk system monitor/debugger

--- End Message ---

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]