Index: source/config/fragments/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
retrieving revision 1.16.16.1
diff -u -r1.16.16.1 makefile.mk
--- openoffice.org.orig/filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
+++ openoffice.org/filter/source/config/fragments/makefile.mk	26 Jan 2006 11:09:31 -0000
@@ -155,7 +155,11 @@
 #cmc, hack to workaround the java build requirement
 MERGE:=python ../tools/merge/pyAltFCFGMerge
 .ELSE
+.IF "$(JAVACACHE)" != ""
+MERGE    := $(BIN)$/FCFGMerge
+.ELSE
 MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
+.ENDIF
 XALAN_JAR*=$(SOLARBINDIR)$/xalan.jar
 PACKLANG := $(JAVAI) $(JAVACPS) $(XALAN_JAR) org.apache.xalan.xslt.Process -XSL langfilter.xsl
 .ENDIF
Index: source/config/tools/merge/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/config/tools/merge/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- openoffice.org.orig/filter/source/config/tools/merge/makefile.mk	8 Sep 2005 21:35:57 -0000	1.5
+++ openoffice.org/filter/source/config/tools/merge/makefile.mk	26 Jan 2006 11:09:33 -0000
@@ -75,6 +75,9 @@
 
 JARTARGET       =   $(TARGET).jar
 
+AOTCLASSNAME = com.sun.star.filter.config.tools.merge.FCFGMerge
+AOTTARGET = FCFGMerge
+
 JARCOMPRESS     =   TRUE
 
 # --- targets -----------------------------------------------------
Index: util/target.pmk
===================================================================
RCS file: /cvs/documentation/helpcontent2/util/target.pmk,v
retrieving revision 1.12
diff -u -r1.12 target.pmk
--- openoffice.org.orig/helpcontent2/util/target.pmk	5 Jan 2006 14:44:39 -0000	1.12
+++ openoffice.org/helpcontent2/util/target.pmk	26 Jan 2006 11:11:17 -0000
@@ -42,6 +42,11 @@
 
 .IF "$(SYSTEM_DB)" != "YES"
 JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
+.ELSE
+.IF "$(JAVACACHE)" != ""
+CLASSPATH!:=$(my_cp)
+.EXPORT : CLASSPATH
+.ENDIF
 .ENDIF
 
 .IF "$(JDK)" != "gcj"
@@ -50,5 +55,8 @@
 
 $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
 	@+-$(MKDIR) -p $(@:d)
+.IF "$(JAVACACHE)" != ""
+	HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
+.ELSE
 	$(JAVAI) $(JAVA_VM_HEAP_SIZE) $(JAVA_LIBRARY_PATH) -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
-
+.ENDIF
Index: bin/deliver.pl
===================================================================
RCS file: /cvs/tools/solenv/bin/deliver.pl,v
retrieving revision 1.98
diff -u -r1.98 deliver.pl
--- openoffice.org.orig/solenv/bin/deliver.pl	13 Jan 2006 16:36:04 -0000	1.98
+++ openoffice.org/solenv/bin/deliver.pl	26 Jan 2006 11:09:09 -0000
@@ -744,19 +744,6 @@
     return $rc;
 };
 
-sub cachejar {
-    if (defined($ENV{JAVACACHE}) && $ENV{JAVACACHE} ne '') {
-        my $file = shift;
-        my $to = $file.".so";
-        my $JAVALINKER = "$ENV{JAVACOMPILER} -shared -fPIC -Wl,-Bsymbolic -O2 -findirect-dispatch -fjni -o";
-        print "CACHEJAR: $file -> $to with $ENV{GCJ_DATABASE}\n";
-        print "Caching 1/2: $JAVALINKER $to $file\n";
-        system("$JAVALINKER $to $file");
-        print "Caching 2/2: $ENV{JAVACACHE} -a $ENV{GCJ_DATABASE} $file $to\n";
-        system("$ENV{JAVACACHE} -a $ENV{GCJ_DATABASE} $file $to");
-    }
-};
-
 sub copy_if_newer 
 {
     # return 0 if file is unchanged ( for whatever reason )
@@ -783,9 +770,6 @@
         # hard link if possible
         if( link($from, $to) ){
             print "LINK: $from -> $to\n";
-            if ($ENV{JDK} eq 'gcj' && is_jar($from)) {
-                cachejar($to);
-            }
             return 1;
         }
     }
@@ -819,9 +803,6 @@
         fix_file_permissions($$from_stat_ref[2], $temp_file);
         $rc = rename($temp_file, $to);
         if ( $rc ) {
-            if (defined($ENV{JDK}) && $ENV{JDK} eq 'gcj' && is_jar($from)) {
-                cachejar($to);
-            }
             # handle special packaging of *.dylib files for Mac OS X
             if ( $^O eq 'darwin' )
             {
Index: inc/settings.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/settings.mk,v
retrieving revision 1.184
diff -u -r1.184 settings.mk
--- openoffice.org.orig/solenv/inc/settings.mk	13 Jan 2006 16:36:21 -0000	1.184
+++ openoffice.org/solenv/inc/settings.mk	26 Jan 2006 11:09:10 -0000
@@ -188,7 +188,7 @@
 #required arguments
 .IF "$(JAVACACHE)" != ""
 JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
-JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
+JAVAI=$(JAVAINTERPRETER)
 .ELSE
 JAVAC=$(JAVACOMPILER)
 JAVAI=$(JAVAINTERPRETER)
Index: inc/target.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/target.mk,v
retrieving revision 1.162
diff -u -r1.162 target.mk
--- openoffice.org.orig/solenv/inc/target.mk	14 Dec 2005 15:37:20 -0000	1.162
+++ openoffice.org/solenv/inc/target.mk	26 Jan 2006 11:09:12 -0000
@@ -437,6 +437,11 @@
 JARTARGETDEP=$(JARTARGET).dep
 JARTARGETDEPN=$(MISC)$/$(JARTARGET).dep
 .ENDIF			# "$(NOJARDEP)$(NEW_JAR_PACK)"==""
+.IF "$(AOTTARGET)"!=""
+.IF "$(JAVACACHE)" != ""
+AOTTARGETN=$(SOLARBINDIR)$/$(AOTTARGET)
+.ENDIF			# "$(JAVACACHE)" != ""
+.ENDIF			# "$(AOTTARGET)"!=""
 .ENDIF			# "$(JARTARGET)"!=""
 .ELSE			# "$(SOLAR_JAVA)"!=""
 JAVACLASSFILES:=
@@ -1791,6 +1796,7 @@
 		$(APP1TARGETN)	$(APP2TARGETN)	$(APP3TARGETN)		\
 		$(APP4TARGETN)	$(APP5TARGETN)	$(APP6TARGETN)		\
 		$(APP7TARGETN)	$(APP8TARGETN)	$(APP9TARGETN)		\
+		$(AOTTARGETN)	\
 		$(JARTARGETN)	\
 		$(JARTARGETDEPN)	\
 		$(SRC1TARGET)	\
Index: inc/tg_jar.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/tg_jar.mk,v
retrieving revision 1.18
diff -u -r1.18 tg_jar.mk
--- openoffice.org.orig/solenv/inc/tg_jar.mk	14 Dec 2005 15:37:35 -0000	1.18
+++ openoffice.org/solenv/inc/tg_jar.mk	26 Jan 2006 11:09:12 -0000
@@ -90,5 +108,19 @@
 	+cd $(CLASSDIR)$/$(TARGET) && zip -u -rX ..$/$(@:f) $(subst,$(CLASSDIR)$/$(TARGET)$/, $(JARMANIFEST)) $(CHECKZIPRESULT)
 .ENDIF			# "$(JARMANIFEST)"!=""
 	+cd $(CLASSDIR) && zip -u -rX $(@:f) $(subst,\,/ $(JARCLASSDIRS)) $(CHECKZIPRESULT)
+
+.IF "$(AOTTARGETN)"!=""
+AOTFILES = $(foreach,i,$(NEWCLASS) $(SOLARLIBDIR)$/lib$(i:b).jar.so)
+AOTLINKFLAGS=$(subst,.so, $(subst,$(SOLARLIBDIR)$/lib,-l $(AOTFILES)))
+
+$(SOLARLIBDIR)$/lib%.jar.so : $(SOLARBINDIR)$/%.jar
+	$(JAVACOMPILER) -shared -fPIC -Wl,-Bsymbolic -O2 --no-bounds-check -fno-store-check -findirect-dispatch -fjni -o $@ $<
+
+$(AOTTARGETN) : $(JARTARGETN) $(AOTFILES)
+	$(JAVACOMPILER) --main=$(AOTCLASSNAME) -o $(BIN)$/$(AOTTARGET) \
+		-Wl,-Bsymbolic -O2 --no-bounds-check -fno-store-check -findirect-dispatch -fjni \
+		$(JAVACPS) $(CLASSPATH) $(JARTARGETN) $(SOLARLIB) -L$(LB) \
+		$(AOTLINKFLAGS)
 .ENDIF
 
+.ENDIF
Index: prj/d.lst
===================================================================
RCS file: /cvs/util/xmlhelp/prj/d.lst,v
retrieving revision 1.13
diff -u -r1.13 d.lst
--- openoffice.org.orig/xmlhelp/prj/d.lst	16 Jan 2006 12:34:13 -0000	1.13
+++ openoffice.org/xmlhelp/prj/d.lst	26 Jan 2006 10:57:58 -0000
@@ -1,4 +1,5 @@
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.*
+..\%__SRC%\bin\HelpLinker %_DEST%\bin%_EXT%\HelpLinker
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.*
 ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.*
Index: source/com/sun/star/help/makefile.mk
===================================================================
RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/makefile.mk,v
retrieving revision 1.21.2.1
diff -u -r1.21.2.1 makefile.mk
--- openoffice.org.orig/xmlhelp/source/com/sun/star/help/makefile.mk	19 Jan 2006 14:48:36 -0000	1.21.2.1
+++ openoffice.org/xmlhelp/source/com/sun/star/help/makefile.mk	26 Jan 2006 10:57:59 -0000
@@ -96,6 +96,9 @@
 JARCOMPRESS 	= TRUE
 CUSTOMMANIFESTFILE = manifest
 
+AOTCLASSNAME = com.sun.star.help.HelpLinker
+AOTTARGET = HelpLinker
+
 
 # --- Targets ------------------------------------------------------