[Libreoffice-commits] .: Branch 'feature/gbuild_java' - 14 commits - javaunohelper/cppumaker javaunohelper/inc javaunohelper/Jar_juh.mk javaunohelper/Library_juh.mk javaunohelper/Library_juhx.mk javaunohelper/Makefile javaunohelper/Module_javaunohelper.mk javaunohelper/Package_cppumaker.mk javaunohelper/prj javaunohelper/Zip_juh.mk jurt/Jar_jurt.mk jurt/Library_jpipe.mk jurt/Library_jpipx.mk jurt/Makefile jurt/Module_jurt.mk jurt/prj jurt/Zip_jurt.mk jvmaccess/inc jvmaccess/Library_jvmaccess.mk jvmaccess/Makefile jvmaccess/Module_jvmaccess.mk jvmaccess/Package_inc.mk jvmaccess/prj jvmaccess/source jvmaccess/util jvmfwk/distributions jvmfwk/inc jvmfwk/JavaClassSet_jreproperties.mk jvmfwk/Library_jvmfwk.mk jvmfwk/Module_jvmfwk.mk jvmfwk/Package_inc.mk jvmfwk/Package_jreproperties.mk jvmfwk/plugins jvmfwk/prj jvmfwk/source odk/pack Repository.mk RepositoryModule_ooo.mk ridljar/javamaker ridljar/Package_javamaker.mk ridljar/Zip_unoloader.mk unoil/climaker unoil/com unoil/drafts unoil/Jar_unoi l.mk unoil/javamaker unoil/Makefile unoil/Module_unoil.mk unoil/Package_climaker.mk unoil/Package_clioootypesversion.mk unoil/Package_javamaker.mk unoil/prj unoil/util ure/source
David Tardon
dtardon at kemper.freedesktop.org
Sat Dec 24 13:25:52 PST 2011
Repository.mk | 11 +
RepositoryModule_ooo.mk | 5
javaunohelper/Jar_juh.mk | 69 ++++++++++++
javaunohelper/Library_juh.mk | 52 +++++++++
javaunohelper/Library_juhx.mk | 54 +++++++++
javaunohelper/Makefile | 40 +++++++
javaunohelper/Module_javaunohelper.mk | 40 +++++++
javaunohelper/Package_cppumaker.mk | 37 ++++++
javaunohelper/Zip_juh.mk | 57 +++++++++
javaunohelper/cppumaker/Makefile | 60 ++++++++++
javaunohelper/inc/makefile.mk | 39 ------
javaunohelper/prj/build.lst | 9 -
javaunohelper/prj/d.lst | 7 -
javaunohelper/prj/makefile.mk | 1
jurt/Jar_jurt.mk | 96 ++++++++++++++++
jurt/Library_jpipe.mk | 54 +++++++++
jurt/Library_jpipx.mk | 39 ++++++
jurt/Makefile | 40 +++++++
jurt/Module_jurt.mk | 46 ++++++++
jurt/Zip_jurt.mk | 87 +++++++++++++++
jurt/prj/build.lst | 19 ---
jurt/prj/d.lst | 8 -
jurt/prj/makefile.mk | 1
jvmaccess/Library_jvmaccess.mk | 62 ++++++++++
jvmaccess/Makefile | 40 +++++++
jvmaccess/Module_jvmaccess.mk | 40 +++++++
jvmaccess/Package_inc.mk | 35 ++++++
jvmaccess/inc/jvmaccess/classpath.hxx | 3
jvmaccess/inc/jvmaccess/jvmaccessdllapi.h | 44 +++++++
jvmaccess/inc/jvmaccess/unovirtualmachine.hxx | 5
jvmaccess/inc/jvmaccess/virtualmachine.hxx | 7 -
jvmaccess/prj/build.lst | 3
jvmaccess/prj/d.lst | 8 -
jvmaccess/prj/makefile.mk | 1
jvmaccess/source/makefile.mk | 46 --------
jvmaccess/util/cc5_solaris_sparc.map | 81 --------------
jvmaccess/util/gcc3.map | 12 ++
jvmaccess/util/makefile.mk | 77 -------------
jvmaccess/util/mingw.map | 71 ------------
jvmaccess/util/msvc_win32_intel.map | 37 ------
jvmaccess/util/msvc_win32_x86-64.map | 37 ------
jvmfwk/JavaClassSet_jreproperties.mk | 34 -----
jvmfwk/Library_jvmfwk.mk | 11 +
jvmfwk/Module_jvmfwk.mk | 2
jvmfwk/Package_inc.mk | 1
jvmfwk/Package_jreproperties.mk | 39 ++++++
jvmfwk/distributions/OpenOfficeorg/makefile.mk | 63 -----------
jvmfwk/inc/jvmfwk/framework.h | 43 +++----
jvmfwk/inc/jvmfwk/jvmfwkdllapi.h | 44 +++++++
jvmfwk/inc/makefile.mk | 39 ------
jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk | 56 ---------
jvmfwk/plugins/sunmajor/pluginlib/Makefile | 37 ++++++
jvmfwk/plugins/sunmajor/pluginlib/makefile.mk | 120 ---------------------
jvmfwk/prj/build.lst | 6 -
jvmfwk/prj/d.lst | 23 ----
jvmfwk/source/makefile.mk | 91 ---------------
odk/pack/gendocu/makefile.mk | 15 --
ridljar/Package_javamaker.mk | 3
ridljar/Zip_unoloader.mk | 2
ridljar/javamaker/Makefile | 2
unoil/Jar_unoil.mk | 36 ++++++
unoil/Makefile | 40 +++++++
unoil/Module_unoil.mk | 47 ++++++++
unoil/Package_climaker.mk | 49 ++++++++
unoil/Package_clioootypesversion.mk | 32 +++++
unoil/Package_javamaker.mk | 38 ++++++
unoil/climaker/Makefile | 61 ++++++++++
unoil/climaker/makefile.mk | 93 ----------------
unoil/com/sun/star/deployment/ui/makefile.mk | 33 -----
unoil/com/sun/star/frame/status/makefile.mk | 35 ------
unoil/com/sun/star/graphic/makefile.mk | 35 ------
unoil/com/sun/star/mail/makefile.mk | 35 ------
unoil/com/sun/star/media/makefile.mk | 35 ------
unoil/drafts/com/sun/star/frame/status/makefile.mk | 35 ------
unoil/javamaker/Makefile | 39 ++++++
unoil/javamaker/makefile.mk | 47 --------
unoil/prj/build.lst | 3
unoil/prj/d.lst | 5
unoil/prj/makefile.mk | 1
unoil/util/makefile.mk | 44 -------
unoil/util/makefile.pmk | 35 ------
ure/source/makefile.mk | 2
82 files changed, 1540 insertions(+), 1351 deletions(-)
New commits:
commit 1efe709c958c8cdccaca0df2637d029d660d85e9
Author: David Tardon <dtardon at redhat.com>
Date: Sat Dec 24 15:55:55 2011 +0100
gbuildize jvmfwk, part 2: finish & clean up
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index fd649ca..00981af 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
idl \
javaunohelper \
jvmaccess \
+ jvmfwk \
jurt \
lingucomponent \
linguistic \
diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk b/jvmfwk/distributions/OpenOfficeorg/makefile.mk
deleted file mode 100755
index 88afdb3..0000000
--- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..
-PRJNAME = jvmfwk
-TARGET = vendors_ooo
-
-.INCLUDE: settings.mk
-
-.IF "$(SOLAR_JAVA)"==""
-nojava:
- @echo "Not building jvmfwk because Java is disabled"
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"!=""
-$(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="FREEBSD"
- -$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors.xml
-.ELIF "$(OS)"=="MACOSX"
- -$(COPY) javavendors_macosx.xml $(BIN)$/javavendors.xml
-.ELIF "$(OS)"=="LINUX" || "$(OS)"=="AIX"
- -$(COPY) javavendors_linux.xml $(BIN)$/javavendors.xml
-.ELSE
- -$(COPY) javavendors_unx.xml $(BIN)$/javavendors.xml
-.ENDIF
-.ELIF "$(GUI)"=="WNT"
- -$(COPY) javavendors_wnt.xml $(BIN)$/javavendors.xml
-.ELSE
- @echo Unsupported platform.
-.ENDIF
-
-.ENDIF # "$(SOLAR_JAVA)"!=""
-
-
-
-
-.INCLUDE: target.mk
-
diff --git a/jvmfwk/inc/makefile.mk b/jvmfwk/inc/makefile.mk
deleted file mode 100644
index 3aec902..0000000
--- a/jvmfwk/inc/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=jvmfwk
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk b/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
deleted file mode 100755
index 8e4a795..0000000
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=javaldx
-TARGET=javaldx
-TARGETTYPE=CUI
-NO_DEFAULT_STL=TRUE
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(OS)" != "MACOSX" && "$(SOLAR_JAVA)" != ""
-
-OBJFILES=$(OBJ)$/javaldx.obj
-
-APP1TARGET=javaldx
-APP1OBJS=$(OBJFILES)
-APP1STDLIBS=$(SALLIB) $(JVMFWKLIB)
-APP1RPATH=UREBIN
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
deleted file mode 100644
index 03c4f58..0000000
--- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
+++ /dev/null
@@ -1,120 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME= jvmfwk
-TARGET = plugin
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-UNOCOMPONENT1=sunjavaplugin
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE =
-
-.IF "$(VALGRIND_CFLAGS)" != ""
-CDEFS += -DHAVE_VALGRIND_H
-CFLAGS += $(VALGRIND_CFLAGS)
-.END
-
-# ------------------------------------------------------------------
-
-.IF "$(SOLAR_JAVA)"!=""
-
-SLOFILES= \
- $(SLO)$/sunversion.obj \
- $(SLO)$/sunjavaplugin.obj \
- $(SLO)$/vendorbase.obj \
- $(SLO)$/util.obj \
- $(SLO)$/sunjre.obj \
- $(SLO)$/gnujre.obj \
- $(SLO)$/vendorlist.obj \
- $(SLO)$/otherjre.obj
-
-LIB1OBJFILES= $(SLOFILES)
-
-LIB1TARGET=$(SLB)$/$(UNOCOMPONENT1).lib
-
-SHL1TARGET=$(ENFORCEDSHLPREFIX)$(UNOCOMPONENT1)
-
-
-SHL1STDLIBS= \
- $(CPPUHELPER) \
- $(CPPULIB) \
- $(SALHELPERLIB) \
- $(SALLIB)
-
-.IF "$(OS)" == "ANDROID"
-SHL1STDLIBS+=-llo-bootstrap
-.ENDIF
-
-.IF "$(GUI)" == "WNT"
-.IF "$(COM)"!="GCC"
-SHL1STDLIBS += uwinapi.lib advapi32.lib
-.ELSE
-SHL1STDLIBS += -luwinapi -ladvapi32
-.ENDIF # GCC
-.ENDIF #WNT
-
-.IF "$(JVM_ONE_PATH_CHECK)" != ""
-CFLAGS += -DJVM_ONE_PATH_CHECK=\"$(JVM_ONE_PATH_CHECK)\"
-.ENDIF
-
-SHL1VERSIONMAP = sunjavaplugin.map
-SHL1DEPN=
-SHL1IMPLIB= i$(UNOCOMPONENT1)
-SHL1LIBS= $(LIB1TARGET)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-SHL1RPATH= URELIB
-
-JAVACLASSFILES= \
- $(CLASSDIR)$/JREProperties.class
-
-JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES)))
-
-.ENDIF # SOLAR_JAVA
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(GUI)"=="WNT"
-BOOTSTRAPFILE=$(BIN)$/sunjavaplugin.ini
-.ELSE
-BOOTSTRAPFILE=$(BIN)$/sunjavapluginrc
-.ENDIF
-
-
-$(BOOTSTRAPFILE): sunjavapluginrc
- -$(COPY) $< $@
-
-
-ALLTAR: \
- $(BOOTSTRAPFILE)
-
diff --git a/jvmfwk/prj/build.lst b/jvmfwk/prj/build.lst
index 1a8d674..5352c4f 100644
--- a/jvmfwk/prj/build.lst
+++ b/jvmfwk/prj/build.lst
@@ -1,6 +1,2 @@
jvmf jvmfwk : cppu cppuhelper sal comphelper LIBXML2:libxml2 NULL
-jvmf jvmfwk\inc nmake - all jvmf_inc NULL
-jvmf jvmfwk\source nmake - all jvmf_framework jvmf_inc NULL
-jvmf jvmfwk\plugins\sunmajor\pluginlib nmake - all jvmf_sunmajorlib jvmf_inc NULL
-jvmf jvmfwk\plugins\sunmajor\javaenvsetup nmake - u jvmf_sunjavaldx jvmf_framework jvmf_inc NULL
-jvmf jvmfwk\distributions\OpenOfficeorg nmake - all jvmf_openoffice jvmf_framework jvmf_inc NULL
+jvmf jvmfwk\prj nmake - all jvmf_prj NULL
diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst
index e8753d1..e69de29 100644
--- a/jvmfwk/prj/d.lst
+++ b/jvmfwk/prj/d.lst
@@ -1,23 +0,0 @@
-mkdir: %_DEST%\inc\jvmfwk
-..\inc\jvmfwk\framework.h %_DEST%\inc\jvmfwk\framework.h
-..\inc\jvmfwk\vendorplugin.h %_DEST%\inc\jvmfwk\vendorplugin.h
-..\%__SRC%\lib\ijvmfwk.lib %_DEST%\lib\ijvmfwk.lib
-..\%__SRC%\lib\libjvmfwk.* %_DEST%\lib\*
-..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin\*
-..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin\*
-..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib\*
-..\%__SRC%\lib\libsunjavaplugin*.so %_DEST%\lib\*
-..\%__SRC%\lib\sunjavaplugin*.dylib %_DEST%\lib\*
-..\%__SRC%\class\JREProperties.class %_DEST%\bin\JREProperties.class
-..\%__SRC%\class\JREProperties.class %_DEST%\lib\JREProperties.class
-..\%__SRC%\bin\javaldx %_DEST%\bin\javaldx
-..\source\javasettingsunopkginstall.xml %_DEST%\bin\javasettingsunopkginstall.xml
-..\%__SRC%\bin\javavendors.xml %_DEST%\bin\javavendors.xml
-..\%__SRC%\bin\javavendors.xml %_DEST%\lib\javavendors.xml
-..\%__SRC%\bin\jvmfwk3rc %_DEST%\lib\jvmfwk3rc
-..\%__SRC%\bin\jvmfwk3.ini %_DEST%\bin\jvmfwk3.ini
-..\%__SRC%\bin\sunjavapluginrc %_DEST%\lib\sunjavapluginrc
-..\%__SRC%\bin\sunjavaplugin.ini %_DEST%\bin\sunjavaplugin.ini
-
-linklib: libjvmfwk.*.*
-linklib: libjvmfwk*.dylib.*.*.*
diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk
deleted file mode 100644
index 76ae22d..0000000
--- a/jvmfwk/source/makefile.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..
-PRJNAME = jvmfwk
-FRAMEWORKLIB=jvmfwk
-TARGET = $(FRAMEWORKLIB)
-ENABLE_EXCEPTIONS = TRUE
-
-.IF "$(OS)" != "WNT"
-UNIXVERSIONNAMES = UDK
-.ENDIF # WNT
-
-.INCLUDE: settings.mk
-
-.IF "$(SYSTEM_LIBXML)" == "YES"
-CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
-.ENDIF
-
-UNOUCROUT = $(OUT)$/inc
-
-SLOFILES = \
- $(SLO)$/framework.obj \
- $(SLO)$/libxmlutil.obj \
- $(SLO)$/fwkutil.obj \
- $(SLO)$/elements.obj \
- $(SLO)$/fwkbase.obj
-
-
-.IF "$(UNIXVERSIONNAMES)" == ""
-SHL1TARGET = $(FRAMEWORKLIB)$(UDK_MAJOR)
-.ELSE # UNIXVERSIONNAMES
-SHL1TARGET = $(FRAMEWORKLIB)
-.ENDIF # UNIXVERSIONNAMES
-
-SHL1DEPN=
-.IF "$(COM)" == "MSC"
-SHL1IMPLIB = i$(FRAMEWORKLIB)
-.ELSE
-SHL1IMPLIB = $(FRAMEWORKLIB)
-.ENDIF
-SHL1LIBS = $(SLB)$/$(TARGET).lib
-SHL1STDLIBS = $(CPPUHELPERLIB) $(SALLIB) $(LIBXML2LIB)
-SHL1RPATH = URELIB
-
-.IF "$(OS)" == "WNT"
-SHL1STDLIBS += $(ADVAPI32LIB)
-.ENDIF # WNT
-
-SHL1VERSIONMAP = framework.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME = $(SHL1TARGET)
-
-.IF "$(GUI)"=="UNX"
-RCFILE=$(BIN)$/jvmfwk3rc
-.ELIF "$(GUI)"=="WNT"
-RCFILE=$(BIN)$/jvmfwk3.ini
-.END
-
-
-.INCLUDE: target.mk
-$(RCFILE): jvmfwk3rc
- -$(COPY) $< $@
-
-ALLTAR: \
- $(RCFILE)
-
commit 13acf1d965248f93adb63affaa1a7bbd86ebe8d2
Author: David Tardon <dtardon at redhat.com>
Date: Sat Dec 24 15:51:46 2011 +0100
fix linking issue on windows
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index 9108f22..5638164 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -44,9 +44,14 @@ $(eval $(call gb_Library_add_api,jvmfwk,\
$(eval $(call gb_Library_add_linked_libs,jvmfwk,\
cppuhelper \
sal \
- $(if $(filter WNT,$(OS)),advapi32) \
))
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_libs,jvmfwk,\
+ advapi32 \
+))
+endif
+
$(eval $(call gb_Library_use_externals,jvmfwk,\
libxml2 \
))
commit 8e3ad9e8472a7752207d93cb6e6eb409da5f962a
Author: David Tardon <dtardon at redhat.com>
Date: Sat Dec 24 15:46:58 2011 +0100
make exported symbols visible
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index f82f347..9108f22 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -33,6 +33,10 @@ $(eval $(call gb_Library_add_package_headers,jvmfwk,\
jvmfwk_inc \
))
+$(eval $(call gb_Library_add_defs,jvmfwk,\
+ -DJVMFWK_DLLIMPLEMENTATION \
+))
+
$(eval $(call gb_Library_add_api,jvmfwk,\
udkapi \
))
diff --git a/jvmfwk/Package_inc.mk b/jvmfwk/Package_inc.mk
index 6f75070..f8ae7ea 100644
--- a/jvmfwk/Package_inc.mk
+++ b/jvmfwk/Package_inc.mk
@@ -28,6 +28,7 @@
$(eval $(call gb_Package_Package,jvmfwk_inc,$(SRCDIR)/jvmfwk/inc/jvmfwk))
$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/framework.h,framework.h))
+$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkdllapi.h,jvmfwkdllapi.h))
$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/vendorplugin.h,vendorplugin.h))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h
index 11cca53..6119c53 100644
--- a/jvmfwk/inc/jvmfwk/framework.h
+++ b/jvmfwk/inc/jvmfwk/framework.h
@@ -31,6 +31,7 @@
#if !defined INCLUDED_JVMFWK_FRAMEWORK_H
#define INCLUDED_JVMFWK_FRAMEWORK_H
+#include "jvmfwkdllapi.h"
#include "rtl/ustring.h"
#include "osl/mutex.h"
#ifdef SOLAR_JAVA
@@ -305,7 +306,7 @@ typedef struct _JavaInfo JavaInfo;
@param pInfo
The object which is to be freed. It can be NULL;
*/
-void SAL_CALL jfw_freeJavaInfo(JavaInfo *pInfo);
+JVMFWK_DLLPUBLIC void SAL_CALL jfw_freeJavaInfo(JavaInfo *pInfo);
/** compares two <code>JavaInfo</code> objects for equality.
@@ -329,7 +330,7 @@ void SAL_CALL jfw_freeJavaInfo(JavaInfo *pInfo);
sal_True - both object represent the same JRE.</br>
sal_False - the objects represend different JREs
*/
-sal_Bool SAL_CALL jfw_areEqualJavaInfo(
+JVMFWK_DLLPUBLIC sal_Bool SAL_CALL jfw_areEqualJavaInfo(
JavaInfo const * pInfoA,JavaInfo const * pInfoB);
/** determines if a Java Virtual Machine is already running.
@@ -352,7 +353,7 @@ sal_Bool SAL_CALL jfw_areEqualJavaInfo(
JFW_E_NONE function ran successfully.<br/>
JFW_E_INVALID_ARG the parameter <code>bRunning</code> was NULL.
*/
-javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning);
/** detects a suitable JRE and configures the framework to use it.
@@ -418,7 +419,7 @@ javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning);
JFW_E_CONFIGURATION mode was not properly set or their prerequisites
were not met.
*/
-javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo);
/** provides information about all availabe JRE installations.
@@ -447,7 +448,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo);
JFW_E_CONFIGURATION mode was not properly set or their prerequisites
were not met.
*/
-javaFrameworkError SAL_CALL jfw_findAllJREs(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_findAllJREs(
JavaInfo ***parInfo, sal_Int32 *pSize);
/** determines if a path points to a Java installation.
@@ -480,7 +481,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(
JFW_E_FAILED_VERSION a JRE was detected but if failed the version
requirements as determined by the javavendors.xml
*/
-javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
rtl_uString *pPath, JavaInfo **ppInfo);
@@ -548,7 +549,7 @@ javaFrameworkError SAL_CALL jfw_getJavaInfoByPath(
JFW_E_FAILED_VERSION the "Default Mode" is active. The JRE determined by
<code>JAVA_HOME</code>does not meet the version requirements.
*/
-javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions,
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions,
sal_Int32 nSize, JavaVM **ppVM,
JNIEnv **ppEnv);
@@ -578,7 +579,7 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions,
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo);
/** provides information about the JRE that is to be used.
@@ -608,7 +609,7 @@ javaFrameworkError SAL_CALL jfw_setSelectedJRE(JavaInfo const *pInfo);
JFW_E_INVALID_SETTINGS the javavendors.xml has been changed and no
JRE has been selected afterwards. <br/>
*/
-javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo);
/** determines if Java can be used.
@@ -627,7 +628,7 @@ javaFrameworkError SAL_CALL jfw_getSelectedJRE(JavaInfo **ppInfo);
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled);
/** provides the information if Java can be used.
@@ -642,7 +643,7 @@ javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled);
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool *pbEnabled);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool *pbEnabled);
/** determines parameters which are passed to VM during its creation.
@@ -666,7 +667,7 @@ javaFrameworkError SAL_CALL jfw_getEnabled(sal_Bool *pbEnabled);
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_setVMParameters(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setVMParameters(
rtl_uString ** arArgs, sal_Int32 nSize);
/** obtains the currently used start parameters.
@@ -691,7 +692,7 @@ javaFrameworkError SAL_CALL jfw_setVMParameters(
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_getVMParameters(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getVMParameters(
rtl_uString *** parParameters,
sal_Int32 * pSize);
@@ -713,7 +714,7 @@ javaFrameworkError SAL_CALL jfw_getVMParameters(
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCP);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCP);
/** provides the value of the current user class path.
<p>The function returns an empty string if no user class path is set.
@@ -732,7 +733,7 @@ javaFrameworkError SAL_CALL jfw_setUserClassPath(rtl_uString * pCP);
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString ** ppCP);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString ** ppCP);
/** saves the location of a JRE.
@@ -761,7 +762,7 @@ javaFrameworkError SAL_CALL jfw_getUserClassPath(rtl_uString ** ppCP);
JFW_E_DIRECT_MODE the function cannot be used in this mode.
@see jfw_setJRELocations
*/
-javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation);
/** saves the locations of a number of JREs.
@@ -789,7 +790,7 @@ javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * sLocation);
JFW_E_DIRECT_MODE the function cannot be used in this mode.
@see jfw_addJRELocations
*/
-javaFrameworkError SAL_CALL jfw_setJRELocations(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setJRELocations(
rtl_uString ** arLocations, sal_Int32 nSize);
/** obtains an array containing paths to JRE installations.
@@ -811,7 +812,7 @@ javaFrameworkError SAL_CALL jfw_setJRELocations(
were not met.<br/>
JFW_E_DIRECT_MODE the function cannot be used in this mode.
*/
-javaFrameworkError SAL_CALL jfw_getJRELocations(
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_getJRELocations(
rtl_uString *** parLocations, sal_Int32 * pSize);
@@ -833,7 +834,7 @@ javaFrameworkError SAL_CALL jfw_getJRELocations(
JFW_E_INVALID_ARG pInfo contains invalid data</br>
JFW_E_NO_PLUGIN a plug-in library could not be found.<br/>
*/
-javaFrameworkError SAL_CALL jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
+JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
/** locks this API so that it cannot be used by other threads.
@@ -851,14 +852,14 @@ javaFrameworkError SAL_CALL jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
The only functions which are not effected by <code>jfw_lock</code> are
<code>jfw_freeJavaInfo</code> and <code>jfw_areEqualJavaInfo</code>.
*/
-void SAL_CALL jfw_lock();
+JVMFWK_DLLPUBLIC void SAL_CALL jfw_lock();
/** unlocks this API.
<p>This function is called after <code>jfw_lock</code>. It allows other
threads to use this API concurrently.</p>
*/
-void SAL_CALL jfw_unlock();
+JVMFWK_DLLPUBLIC void SAL_CALL jfw_unlock();
#ifdef __cplusplus
diff --git a/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h b/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h
new file mode 100644
index 0000000..6a34397
--- /dev/null
+++ b/jvmfwk/inc/jvmfwk/jvmfwkdllapi.h
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+ * (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_JVMFWK_JVMFWKDLLAPI_H
+#define INCLUDED_JVMFWK_JVMFWKDLLAPI_H
+
+#include <sal/types.h>
+
+#if defined JVMFWK_DLLIMPLEMENTATION
+# define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+# define JVMFWK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define JVMFWK_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit e648ad6707c80183bfe925d553fb4a079fc3bc64
Author: David Tardon <dtardon at redhat.com>
Date: Sat Dec 24 15:44:49 2011 +0100
build JREProperties.class
diff --git a/jvmfwk/JavaClassSet_jreproperties.mk b/jvmfwk/JavaClassSet_jreproperties.mk
deleted file mode 100644
index 1448408..0000000
--- a/jvmfwk/JavaClassSet_jreproperties.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_JavaClassSet_JavaClassSet,jvmfwk_jreproperties))
-
-$(eval $(call gb_JavaClassSet_add_sourcefiles,jvmfwk_jreproperties,\
- jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk
index dba94da..a6131da 100644
--- a/jvmfwk/Module_jvmfwk.mk
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -30,11 +30,11 @@ $(eval $(call gb_Module_Module,jvmfwk))
ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,jvmfwk,\
- JavaClassSet_jreproperties \
Library_jvmfwk \
Library_sunjavaplugin \
Package_inc \
Package_javavendors \
+ Package_jreproperties \
Package_rcfiles \
))
diff --git a/jvmfwk/Package_jreproperties.mk b/jvmfwk/Package_jreproperties.mk
new file mode 100644
index 0000000..4e35e7e
--- /dev/null
+++ b/jvmfwk/Package_jreproperties.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(WORKDIR)/CustomTarget/jvmfwk/plugins/sunmajor/pluginlib))
+
+$(eval $(call gb_Package_add_customtarget,jvmfwk_jreproperties,jvmfwk/plugins/sunmajor/pluginlib))
+
+$(eval $(call gb_CustomTarget_add_dependencies,jvmfwk/plugins/sunmajor/pluginlib,\
+ jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java \
+))
+
+$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,bin/JREProperties.class,JREProperties.class))
+$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,lib/JREProperties.class,JREProperties.class))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/Makefile b/jvmfwk/plugins/sunmajor/pluginlib/Makefile
new file mode 100644
index 0000000..2e91b1d
--- /dev/null
+++ b/jvmfwk/plugins/sunmajor/pluginlib/Makefile
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+include $(GBUILDDIR)/gbuild.mk
+
+JREProperties.class : $(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
+ $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : JREProperties.class
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
commit ef8a7d3b68b49e1525d922c6eb158e401ae4a7ee
Author: David Tardon <dtardon at redhat.com>
Date: Sat Dec 24 15:15:55 2011 +0100
remove resolved TODO note
diff --git a/ridljar/Zip_unoloader.mk b/ridljar/Zip_unoloader.mk
index 30500a7..0174743 100644
--- a/ridljar/Zip_unoloader.mk
+++ b/ridljar/Zip_unoloader.mk
@@ -25,8 +25,6 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-# TODO: the zip is placed in $(OUTDIR)/pck, not in $(OUTDIR)/bin. Does
-# it matter?
$(eval $(call gb_Zip_Zip,unoloader_src,$(SRCDIR)/ridljar/source/unoloader))
$(eval $(call gb_Zip_add_files,unoloader_src,\
commit 788b863acb0366d383ff8f730ac84acc0d683ab0
Author: David Tardon <dtardon at redhat.com>
Date: Sat Dec 24 15:15:18 2011 +0100
fix vim modeline
diff --git a/ridljar/javamaker/Makefile b/ridljar/javamaker/Makefile
index 6c818c6..65c106b 100644
--- a/ridljar/javamaker/Makefile
+++ b/ridljar/javamaker/Makefile
@@ -35,4 +35,4 @@ done : $(OUTDIR)/bin/udkapi.rdb
.PHONY : all
all : done
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
commit e54637bf0b85605cc045d34e7ede19a05f7fe7b8
Author: David Tardon <dtardon at redhat.com>
Date: Sat Dec 24 15:14:26 2011 +0100
add dep on javamaker
diff --git a/ridljar/Package_javamaker.mk b/ridljar/Package_javamaker.mk
index a83656e..677f11d 100644
--- a/ridljar/Package_javamaker.mk
+++ b/ridljar/Package_javamaker.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Package_Package,ridljar_javamaker,$(WORKDIR)/CustomTarget/ridlj
$(eval $(call gb_Package_add_customtarget,ridljar_javamaker,ridljar/javamaker))
$(eval $(call gb_CustomTarget_add_outdir_dependencies,ridljar/javamaker,\
+ $(OUTDIR_FOR_BUILD)/bin/javamaker \
$(OUTDIR)/bin/udkapi.rdb \
))
commit 952ad628bf9d4fa690173945fc7fc60c143611ee
Author: David Tardon <dtardon at redhat.com>
Date: Sat Dec 24 15:14:19 2011 +0100
fix typo
diff --git a/ridljar/Package_javamaker.mk b/ridljar/Package_javamaker.mk
index c037e2d..a83656e 100644
--- a/ridljar/Package_javamaker.mk
+++ b/ridljar/Package_javamaker.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Package_Package,ridljar_javamaker,$(WORKDIR)/CustomTarget/ridlj
$(eval $(call gb_Package_add_customtarget,ridljar_javamaker,ridljar/javamaker))
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,ridljar_javamaker,\
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,ridljar/javamaker,\
$(OUTDIR)/bin/udkapi.rdb \
))
commit 80c8e6fb03fb455fdebab4492ce04ff9cf695c38
Author: David Tardon <dtardon at redhat.com>
Date: Sat Dec 24 13:37:11 2011 +0100
gbuildize javaunohelper
diff --git a/Repository.mk b/Repository.mk
index ec20e0a..b6bde2f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -269,6 +269,8 @@ endif
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
jpipe \
+ juh \
+ juhx \
sal_textenc \
sunjavaplugin \
xmlreader \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 64ab748..fd649ca 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
i18npool \
i18nutil \
idl \
+ javaunohelper \
jvmaccess \
jurt \
lingucomponent \
diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk
new file mode 100644
index 0000000..142805d
--- /dev/null
+++ b/javaunohelper/Jar_juh.mk
@@ -0,0 +1,69 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Jar_Jar,juh))
+
+$(eval $(call gb_Jar_add_jars,juh,\
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,juh,com))
+
+$(eval $(call gb_Jar_set_manifest,juh,$(SRCDIR)/javaunohelper/util/manifest))
+
+$(eval $(call gb_Jar_set_componentfile,juh,javaunohelper/util/juh,URE))
+
+$(eval $(call gb_Jar_add_sourcefiles,juh,\
+ javaunohelper/com/sun/star/comp/JavaUNOHelperServices \
+ javaunohelper/com/sun/star/comp/helper/Bootstrap \
+ javaunohelper/com/sun/star/comp/helper/BootstrapException \
+ javaunohelper/com/sun/star/comp/helper/ComponentContext \
+ javaunohelper/com/sun/star/comp/helper/ComponentContextEntry \
+ javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory \
+ javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader \
+ javaunohelper/com/sun/star/comp/helper/UnoInfo \
+ javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment \
+ javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter \
+ javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter \
+ javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter \
+ javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter \
+ javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter \
+ javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter \
+ javaunohelper/com/sun/star/lib/uno/helper/ComponentBase \
+ javaunohelper/com/sun/star/lib/uno/helper/Factory \
+ javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer \
+ javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer \
+ javaunohelper/com/sun/star/lib/uno/helper/PropertySet \
+ javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin \
+ javaunohelper/com/sun/star/lib/uno/helper/UnoUrl \
+ javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter \
+ javaunohelper/com/sun/star/lib/uno/helper/WeakBase \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk
new file mode 100644
index 0000000..7c34479
--- /dev/null
+++ b/javaunohelper/Library_juh.mk
@@ -0,0 +1,52 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,juh))
+
+$(eval $(call gb_Library_add_package_headers,juh,\
+ javaunohelper_cppumaker \
+))
+
+$(eval $(call gb_Library_set_include,juh,\
+ $$(INCLUDE) \
+ -I$(WORKDIR)/CustomTarget/javaunohelper/cppumaker \
+))
+
+$(eval $(call gb_Library_add_api,juh,\
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,juh,\
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,juh,\
+ javaunohelper/source/preload \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk
new file mode 100644
index 0000000..fe066b4
--- /dev/null
+++ b/javaunohelper/Library_juhx.mk
@@ -0,0 +1,54 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,juhx))
+
+$(eval $(call gb_Library_add_package_headers,juhx,\
+ javaunohelper_cppumaker \
+))
+
+$(eval $(call gb_Library_set_include,juhx,\
+ $$(INCLUDE) \
+ -I$(WORKDIR)/CustomTarget/javaunohelper/cppumaker \
+))
+
+$(eval $(call gb_Library_add_linked_libs,juhx,\
+ cppu \
+ cppuhelper \
+ jvmaccess \
+ sal \
+ salhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,juhx,\
+ javaunohelper/source/bootstrap \
+ javaunohelper/source/javaunohelper \
+ javaunohelper/source/vm \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/Makefile b/javaunohelper/Makefile
new file mode 100644
index 0000000..7bbbe6c
--- /dev/null
+++ b/javaunohelper/Makefile
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
+
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/javaunohelper/Module_javaunohelper.mk b/javaunohelper/Module_javaunohelper.mk
new file mode 100644
index 0000000..153f8b2
--- /dev/null
+++ b/javaunohelper/Module_javaunohelper.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,javaunohelper))
+
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Module_add_targets,javaunohelper,\
+ Library_juh \
+ Library_juhx \
+ Jar_juh \
+ Package_cppumaker \
+ Zip_juh \
+))
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/Package_cppumaker.mk b/javaunohelper/Package_cppumaker.mk
new file mode 100644
index 0000000..5ab6664
--- /dev/null
+++ b/javaunohelper/Package_cppumaker.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,javaunohelper_cppumaker,$(WORKDIR)/CustomTarget/javaunohelper/cppumaker))
+
+$(eval $(call gb_Package_add_customtarget,javaunohelper_cppumaker,javaunohelper/cppumaker))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,javaunohelper/cppumaker,\
+ $(OUTDIR_FOR_BUILD)/bin/cppumaker \
+ $(OUTDIR)/bin/udkapi.rdb \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/Zip_juh.mk b/javaunohelper/Zip_juh.mk
new file mode 100644
index 0000000..e59c4ce
--- /dev/null
+++ b/javaunohelper/Zip_juh.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Zip_Zip,juh_src,$(SRCDIR)/javaunohelper))
+
+$(eval $(call gb_Zip_add_files,juh_src,\
+ com/sun/star/comp/JavaUNOHelperServices.java \
+ com/sun/star/comp/helper/Bootstrap.java \
+ com/sun/star/comp/helper/BootstrapException.java \
+ com/sun/star/comp/helper/ComponentContext.java \
+ com/sun/star/comp/helper/ComponentContextEntry.java \
+ com/sun/star/comp/helper/RegistryServiceFactory.java \
+ com/sun/star/comp/helper/SharedLibraryLoader.java \
+ com/sun/star/comp/helper/UnoInfo.java \
+ com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java \
+ com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java \
+ com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java \
+ com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java \
+ com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java \
+ com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java \
+ com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java \
+ com/sun/star/lib/uno/helper/ComponentBase.java \
+ com/sun/star/lib/uno/helper/Factory.java \
+ com/sun/star/lib/uno/helper/InterfaceContainer.java \
+ com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java \
+ com/sun/star/lib/uno/helper/PropertySet.java \
+ com/sun/star/lib/uno/helper/PropertySetMixin.java \
+ com/sun/star/lib/uno/helper/UnoUrl.java \
+ com/sun/star/lib/uno/helper/WeakAdapter.java \
+ com/sun/star/lib/uno/helper/WeakBase.java \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/cppumaker/Makefile b/javaunohelper/cppumaker/Makefile
new file mode 100644
index 0000000..230daa0
--- /dev/null
+++ b/javaunohelper/cppumaker/Makefile
@@ -0,0 +1,60 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+gb_PARTIALBUILD := T
+include $(GBUILDDIR)/gbuild_simple.mk
+
+done :
+ $(call gb_Helper_execute,cppumaker -C -BUCR -O. \
+ -Tcom.sun.star.beans.NamedValue \
+ -Tcom.sun.star.beans.XPropertySet \
+ -Tcom.sun.star.container.XHierarchicalNameAccess \
+ -Tcom.sun.star.lang.DisposedException \
+ -Tcom.sun.star.lang.IllegalArgumentException \
+ -Tcom.sun.star.lang.XComponent \
+ -Tcom.sun.star.lang.XInitialization \
+ -Tcom.sun.star.lang.XMultiComponentFactory \
+ -Tcom.sun.star.lang.XMultiServiceFactory \
+ -Tcom.sun.star.lang.XServiceInfo \
+ -Tcom.sun.star.lang.XSingleComponentFactory \
+ -Tcom.sun.star.lang.XSingleServiceFactory \
+ -Tcom.sun.star.lang.XTypeProvider \
+ -Tcom.sun.star.loader.XImplementationLoader \
+ -Tcom.sun.star.registry.XRegistryKey \
+ -Tcom.sun.star.registry.XSimpleRegistry \
+ -Tcom.sun.star.uno.TypeClass \
+ -Tcom.sun.star.uno.XAggregation \
+ -Tcom.sun.star.uno.XComponentContext \
+ -Tcom.sun.star.uno.XWeak \
+ $(OUTDIR)/bin/udkapi.rdb) && \
+ touch $@
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : done
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/javaunohelper/inc/makefile.mk b/javaunohelper/inc/makefile.mk
deleted file mode 100644
index 072e7df..0000000
--- a/javaunohelper/inc/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=javaunohelper
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/javaunohelper/prj/build.lst b/javaunohelper/prj/build.lst
index d97a645..f2fe76d 100644
--- a/javaunohelper/prj/build.lst
+++ b/javaunohelper/prj/build.lst
@@ -1,10 +1,3 @@
jh javaunohelper : LIBXSLT:libxslt bridges cppuhelper jurt ridljar unoil NULL
jh javaunohelper usr1 - all jh_mkout NULL
-jh javaunohelper\inc nmake - all jh_inc NULL
-jh javaunohelper\com\sun\star\comp\helper nmake - all jh_helper jh_inc NULL
-jh javaunohelper\com\sun\star\comp\juhtest nmake - all jh_juhtest jh_helper jh_libhelp NULL
-jh javaunohelper\com\sun\star\comp nmake - all jh_comp jh_juhtest NULL
-jh javaunohelper\com\sun\star\lib\uno\adapter nmake - all jh_adapter jh_libhelp jh_inc NULL
-jh javaunohelper\com\sun\star\lib\uno\helper nmake - all jh_libhelp jh_inc NULL
-jh javaunohelper\source nmake - all jh_source jh_inc NULL
-jh javaunohelper\util nmake - all jh_util jh_helper jh_source jh_adapter jh_libhelp jh_comp NULL
+jh javaunohelper\prj nmake - all jh_prj NULL
diff --git a/javaunohelper/prj/d.lst b/javaunohelper/prj/d.lst
index 15e14f6..e69de29 100644
--- a/javaunohelper/prj/d.lst
+++ b/javaunohelper/prj/d.lst
@@ -1,7 +0,0 @@
-..\%__SRC%\class\juh.jar %_DEST%\bin\juh.jar
-..\%__SRC%\bin\juh*.dll %_DEST%\bin\juh*.dll
-..\%__SRC%\lib\libjuh*.so %_DEST%\lib\libjuh*.so
-..\%__SRC%\lib\libjuh*.dylib %_DEST%\lib\libjuh*.dylib
-..\%__SRC%\misc\juh.component %_DEST%\xml\juh.component
-
-..\%__SRC%\bin\juh_src.zip %COMMON_DEST%\bin\juh_src.zip
diff --git a/javaunohelper/prj/makefile.mk b/javaunohelper/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/javaunohelper/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index 915d956..5f9f86a 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -52,16 +52,12 @@ JAVA_PACKAGES=\
$(JAVA_SRC_DIR)$/com$/sun$/star$/lib$/util$/UrlToFileMapper.java
# com.sun.star.beans \
-JAVA_SRC_FILES_BIN=\
- $(JAVA_SRC_DIR)$/juh_src.zip
-
-JAVA_SRC_FILES_PCK=\
+JAVA_SRC_FILES=\
+ $(JAVA_SRC_DIR)$/juh_src.zip \
$(JAVA_SRC_DIR)$/jurt_src.zip \
$(JAVA_SRC_DIR)$/ridl_src.zip \
$(JAVA_SRC_DIR)$/unoloader_src.zip
-JAVA_SRC_FILES=$(JAVA_SRC_FILES_BIN) $(JAVA_SRC_FILES_PCK)
-
JAVA_BEAN_SRC_FILES=\
$(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/ContainerFactory.java \
$(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/JavaWindowPeerFake.java \
@@ -105,12 +101,7 @@ $(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEANUP_FLAG)
-rm $(@:d:d)$/cpp.css
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/cpp.css
-$(JAVA_SRC_FILES_BIN) : $(SOLARCOMMONBINDIR)$/$$(@:f)
- -$(MKDIRHIER) $(@:d)
- $(MY_COPY) $< $@
- cd $(JAVA_SRC_DIR) && unzip -quo $(@:f)
-
-$(JAVA_SRC_FILES_PCK) : $(SOLARCOMMONPCKDIR)$/$$(@:f)
+$(JAVA_SRC_FILES) : $(SOLARCOMMONPCKDIR)$/$$(@:f)
-$(MKDIRHIER) $(@:d)
$(MY_COPY) $< $@
cd $(JAVA_SRC_DIR) && unzip -quo $(@:f)
diff --git a/ure/source/makefile.mk b/ure/source/makefile.mk
index 1f75890..eff4cf6 100644
--- a/ure/source/makefile.mk
+++ b/ure/source/makefile.mk
@@ -55,7 +55,7 @@ my_components = \
my_components += \
javaloader \
javavm \
- juh
+ component/javaunohelper/util/juh
.ENDIF
commit c77a11e1425280d29b061d10d5fb88e174a3841f
Author: David Tardon <dtardon at redhat.com>
Date: Sat Dec 24 12:43:31 2011 +0100
remove old cruft
diff --git a/unoil/com/sun/star/deployment/ui/makefile.mk b/unoil/com/sun/star/deployment/ui/makefile.mk
deleted file mode 100644
index e8c4cb1..0000000
--- a/unoil/com/sun/star/deployment/ui/makefile.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJNAME = unoil
-PRJ = ..$/..$/..$/..$/..
-TARGET = unoil_deployment_ui
-PACKAGE = com$/sun$/star$/deployment$/ui
-
-.INCLUDE : $(PRJ)$/makefile.pmk
diff --git a/unoil/com/sun/star/frame/status/makefile.mk b/unoil/com/sun/star/frame/status/makefile.mk
deleted file mode 100644
index 2739547..0000000
--- a/unoil/com/sun/star/frame/status/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJNAME = unoil
-PRJ = ..$/..$/..$/..$/..
-TARGET = unoil_framestatus
-PACKAGE = com$/sun$/star$/frame$/status
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/makefile.pmk
diff --git a/unoil/com/sun/star/graphic/makefile.mk b/unoil/com/sun/star/graphic/makefile.mk
deleted file mode 100755
index 1863ad6..0000000
--- a/unoil/com/sun/star/graphic/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJNAME = unoil
-PRJ = ..$/..$/..$/..
-TARGET = unoil_graphic
-PACKAGE = com$/sun$/star$/graphic
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/makefile.pmk
diff --git a/unoil/com/sun/star/mail/makefile.mk b/unoil/com/sun/star/mail/makefile.mk
deleted file mode 100644
index 0db33e5..0000000
--- a/unoil/com/sun/star/mail/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJNAME = unoil
-PRJ = ..$/..$/..$/..
-TARGET = unoil_mail
-PACKAGE = com$/sun$/star$/mail
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/makefile.pmk
diff --git a/unoil/com/sun/star/media/makefile.mk b/unoil/com/sun/star/media/makefile.mk
deleted file mode 100644
index 74c5f52..0000000
--- a/unoil/com/sun/star/media/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJNAME = unoil
-PRJ = ..$/..$/..$/..
-TARGET = unoil_media
-PACKAGE = com$/sun$/star$/media
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/makefile.pmk
diff --git a/unoil/drafts/com/sun/star/frame/status/makefile.mk b/unoil/drafts/com/sun/star/frame/status/makefile.mk
deleted file mode 100644
index f5c93aa..0000000
--- a/unoil/drafts/com/sun/star/frame/status/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJNAME = unoil
-PRJ = ..$/..$/..$/..$/..$/..
-TARGET = unoil_framestatus_drafts
-PACKAGE = drafts$/com$/sun$/star$/frame$/status
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/makefile.pmk
commit 824a6406050560b6cf6d90510c20e8a4e8b6d062
Author: David Tardon <dtardon at redhat.com>
Date: Sat Dec 24 12:43:01 2011 +0100
gbuildize unoil
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 19333ef..64ab748 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -101,6 +101,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
ucbhelper \
udkapi \
unixODBC \
+ unoil \
unotools \
unoxml \
uui \
diff --git a/unoil/Jar_unoil.mk b/unoil/Jar_unoil.mk
new file mode 100644
index 0000000..7e3ba39
--- /dev/null
+++ b/unoil/Jar_unoil.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Jar_Jar,unoil))
+
+$(eval $(call gb_Jar_add_packagedirs,unoil,\
+ $(WORKDIR)/CustomTarget/unoil/javamaker/com \
+))
+
+$(call gb_Jar_get_target,unoil) : $(call gb_Package_get_target,unoil_javamaker)
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unoil/Makefile b/unoil/Makefile
new file mode 100644
index 0000000..7bbbe6c
--- /dev/null
+++ b/unoil/Makefile
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
+
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk
new file mode 100644
index 0000000..826e5a7
--- /dev/null
+++ b/unoil/Module_unoil.mk
@@ -0,0 +1,47 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,unoil))
+
+$(eval $(call gb_Module_add_targets,unoil,\
+ Package_clioootypesversion \
+))
+
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Module_add_targets,unoil,\
+ Jar_unoil \
+ Package_javamaker \
+))
+endif
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Module_add_targets,unoil,\
+ Package_climaker \
+))
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unoil/Package_climaker.mk b/unoil/Package_climaker.mk
new file mode 100644
index 0000000..e12ef54
--- /dev/null
+++ b/unoil/Package_climaker.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,unoil_climaker,$(WORKDIR)/CustomTarget/unoil/climaker))
+
+$(eval $(call gb_Package_add_customtarget,unoil_climaker,unoil/climaker))
+
+$(eval $(call gb_Package_add_file,unoil_climaker,bin/cli_oootypes.config,cli_oootypes.config))
+$(eval $(call gb_Package_add_file,unoil_climaker,bin/cli_oootypes.dll,cli_oootypes.dll))
+$(eval $(call gb_Package_add_file,unoil_climaker,bin/policy.1.0.cli_oootypes.dll,policy.1.0.cli_oootypes.dll))
+
+$(eval $(call gb_CustomTarget_add_dependencies,unoil/climaker,\
+ unoil/climaker/cli_oootypes_config \
+ unoil/climaker/version.txt \
+))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,unoil/climaker,\
+ $(OUTDIR_FOR_BUILD)/bin/climaker \
+ $(OUTDIR)/bin/cli_uretypes.dll \
+ $(OUTDIR)/bin/cliuno.snk \
+ $(OUTDIR)/bin/offapi.rdb \
+ $(OUTDIR)/bin/udkapi.rdb \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unoil/Package_clioootypesversion.mk b/unoil/Package_clioootypesversion.mk
new file mode 100644
index 0000000..5da7493
--- /dev/null
+++ b/unoil/Package_clioootypesversion.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,unoil_clioootypesversion,$(SRCDIR)/unoil/climaker))
+
+$(eval $(call gb_Package_add_file,unoil_clioootypesversion,bin/clioootypesversion.mk,version.txt))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unoil/Package_javamaker.mk b/unoil/Package_javamaker.mk
new file mode 100644
index 0000000..add0a60
--- /dev/null
+++ b/unoil/Package_javamaker.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,unoil_javamaker,$(WORKDIR)/CustomTarget/unoil/javamaker))
+
+$(eval $(call gb_Package_add_customtarget,unoil_javamaker,unoil/javamaker))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,unoil/javamaker,\
+ $(OUTDIR_FOR_BUILD)/bin/javamaker \
+ $(OUTDIR)/bin/offapi.rdb \
+ $(OUTDIR)/bin/udkapi.rdb \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unoil/climaker/Makefile b/unoil/climaker/Makefile
new file mode 100644
index 0000000..a1f1fe6
--- /dev/null
+++ b/unoil/climaker/Makefile
@@ -0,0 +1,61 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+gb_PARTIALBUILD := T
+include $(GBUILDDIR)/gbuild_simple.mk
+
+include $(SRCDIR)/unoil/climaker/version.txt
+
+cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt
+ $(call gb_Helper_execute,climaker \
+ $(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
+ --out $@ \
+ --assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
+ --assembly-company "LibreOffice" \
+ --assembly-description "This assembly contains metadata for the LibreOffice API." \
+ -X $(OUTDIR)/bin/udkapi.rdb \
+ -r $(OUTDIR)/bin/cli_uretypes.dll \
+ --keyfile $(OUTDIR)/bin/cliuno.snk \
+ $(OUTDIR)/bin/offapi.rdb)
+
+cli_oootypes.config : $(SRCDIR)/unoil/climaker/cli_oootypes_config $(SRCDIR)/unoil/climaker/version.txt
+ perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $< $@
+
+$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : cli_oootypes.dll cli_oootypes.config
+ al -out:$@ \
+ -version:$(CLI_OOOTYPES_POLICY_VERSION) \
+ -keyfile:$(OUTDIR)/bin/cliuno.snk \
+ -link:cli_oootypes.config
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : \
+ cli_oootypes.dll \
+ cli_oootypes.config \
+ $(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/unoil/climaker/makefile.mk b/unoil/climaker/makefile.mk
deleted file mode 100644
index d820e72..0000000
--- a/unoil/climaker/makefile.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..
-PRJNAME = unoil
-
-# for dummy
-TARGET = unotypes
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.INCLUDE : target.mk
-
-.INCLUDE : version.txt
-
-POLICY_ASSEMBLY_FILE=$(BIN)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
-
-.IF "$(BUILD_FOR_CLI)" != ""
-
-ALLTAR : \
- $(BIN)$/clioootypesversion.mk \
- $(BIN)$/cli_oootypes.dll \
- $(POLICY_ASSEMBLY_FILE)
-
-.ELSE
-
-ALLTAR : \
- $(BIN)$/clioootypesversion.mk
-
-.ENDIF
-
-
-CLIMAKERFLAGS =
-.IF "$(debug)" != ""
-CLIMAKERFLAGS += --verbose
-.ENDIF
-
-RDB = $(SOLARBINDIR)$/offapi.rdb
-EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
-
-$(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) version.txt
- $(CLIMAKER) $(CLIMAKERFLAGS) \
- --out $@ \
- --assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
- --assembly-company "OpenOffice.org" \
- --assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
- -X $(EXTRA_RDB) \
- -r $(SOLARBINDIR)$/cli_uretypes.dll \
- --keyfile $(SOLARBINDIR)$/cliuno.snk \
- $(RDB)
-
-
-#Create the config file that is used with the policy assembly
-$(BIN)$/cli_oootypes.config: cli_oootypes_config version.txt
- $(PERL) $(SOLARENV)$/bin$/clipatchconfig.pl \
- $< $@
-
-$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_oootypes.config $(BIN)$/cli_oootypes.dll
- $(WRAPCMD) AL.exe -out:$@ \
- -version:$(CLI_OOOTYPES_POLICY_VERSION) \
- -keyfile:$(SOLARBINDIR)$/cliuno.snk \
- -link:$(BIN)$/cli_oootypes.config
-
-#always deliver a clioootypesversion.mk. It is needed for the packing process even for all other
-#platforms. Therefore BUILD_FOR_CLI is not used here
-$(BIN)$/clioootypesversion.mk: version.txt
- $(GNUCOPY) $< $@
-
diff --git a/unoil/javamaker/Makefile b/unoil/javamaker/Makefile
new file mode 100644
index 0000000..7c21708
--- /dev/null
+++ b/unoil/javamaker/Makefile
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+gb_PARTIALBUILD := T
+include $(GBUILDDIR)/gbuild_simple.mk
+
+done :
+ $(call gb_Helper_execute,javamaker -BUCR -O$(realpath .) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \
+ touch $@
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : done
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/unoil/javamaker/makefile.mk b/unoil/javamaker/makefile.mk
deleted file mode 100644
index 47f9103..0000000
--- a/unoil/javamaker/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..
-PRJNAME := unoil
-TARGET := javamaker
-
-.INCLUDE: settings.mk
-
-RDB = $(SOLARBINDIR)$/offapi.rdb
-EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
-
-.INCLUDE: target.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-
-ALLTAR: $(MISC)$/javamaker.done
-
-$(MISC)$/javamaker.done .ERRREMOVE: $(RDB) $(EXTRA_RDB)
- $(JAVAMAKER) -BUCR -O$(CLASSDIR) $(RDB) -X$(EXTRA_RDB)
- $(TOUCH) $@
-
-.ENDIF
diff --git a/unoil/prj/build.lst b/unoil/prj/build.lst
index 15104e8..5667774 100644
--- a/unoil/prj/build.lst
+++ b/unoil/prj/build.lst
@@ -1,4 +1,2 @@
ul unoil :: DESKTOP:codemaker offapi ridljar solenv cli_ure NULL
-ul unoil\javamaker nmake - all ul_javamaker NULL
-ul unoil\util nmake - all ul_util ul_javamaker NULL
-ul unoil\climaker nmake - all ul_climaker NULL
\ No newline at end of file
+ul unoil\prj nmake - all ul_prj NULL
diff --git a/unoil/prj/d.lst b/unoil/prj/d.lst
index b4ee581..e69de29 100644
--- a/unoil/prj/d.lst
+++ b/unoil/prj/d.lst
@@ -1,5 +0,0 @@
-..\%__SRC%\class\unoil.jar %_DEST%\bin\unoil.jar
-..\%__SRC%\bin\cli_oootypes.dll %_DEST%\bin\cli_oootypes.dll
-..\%__SRC%\bin\cli_oootypes.config %_DEST%\bin\cli_oootypes.config
-..\%__SRC%\bin\policy*.dll %_DEST%\bin\policy*.dll
-..\%__SRC%\bin\clioootypesversion.mk %_DEST%\bin\clioootypesversion.mk
diff --git a/unoil/prj/makefile.mk b/unoil/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/unoil/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/unoil/util/makefile.mk b/unoil/util/makefile.mk
deleted file mode 100644
index c2bd22e..0000000
--- a/unoil/util/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..
-PRJNAME = unoil
-TARGET = unoil
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS = com
-JARTARGET = $(TARGET).jar
-JARCOMPRESS = TRUE
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/unoil/util/makefile.pmk b/unoil/util/makefile.pmk
deleted file mode 100644
index 6a3ea0d..0000000
--- a/unoil/util/makefile.pmk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# no translation here anyway
-.IF "$(L10N_framework)"==""
-.IF "$(COM)" == "MSC"
-BUILD_FOR_CLI = "true"
-CFLAGSENABLESYMBOLS:=-Z7
-.ENDIF
-.ENDIF # "L10N_framework"==""
-
commit 8c0e9a86a20478418e1c98f3a808627fe5cde716
Author: David Tardon <dtardon at redhat.com>
Date: Sat Dec 24 10:16:48 2011 +0100
gbuildize jurt
diff --git a/Repository.mk b/Repository.mk
index f150adb..ec20e0a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -268,11 +268,20 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
endif
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+ jpipe \
sal_textenc \
sunjavaplugin \
xmlreader \
))
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+ jpipx \
+))
+
+endif
+
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
affine_uno \
avmediagst \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 7e48566..19333ef 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
i18nutil \
idl \
jvmaccess \
+ jurt \
lingucomponent \
linguistic \
lotuswordpro \
diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk
new file mode 100644
index 0000000..8a6a87d
--- /dev/null
+++ b/jurt/Jar_jurt.mk
@@ -0,0 +1,96 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Jar_Jar,jurt))
+
+$(eval $(call gb_Jar_add_jars,jurt,\
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoloader.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,jurt,com))
+
+$(eval $(call gb_Jar_set_manifest,jurt,$(SRCDIR)/jurt/util/manifest))
+
+$(eval $(call gb_Jar_add_sourcefiles,jurt,\
+ jurt/com/sun/star/comp/bridgefactory/BridgeFactory \
+ jurt/com/sun/star/comp/connections/Acceptor \
+ jurt/com/sun/star/comp/connections/Connector \
+ jurt/com/sun/star/comp/connections/ConstantInstanceProvider \
+ jurt/com/sun/star/comp/connections/Implementation \
+ jurt/com/sun/star/comp/connections/PipedConnection \
+ jurt/com/sun/star/comp/loader/FactoryHelper \
+ jurt/com/sun/star/comp/loader/JavaLoader \
+ jurt/com/sun/star/comp/loader/JavaLoaderFactory \
+ jurt/com/sun/star/comp/loader/RegistrationClassFinder \
+ jurt/com/sun/star/comp/servicemanager/ServiceManager \
+ jurt/com/sun/star/comp/urlresolver/UrlResolver \
+ jurt/com/sun/star/lib/connections/pipe/PipeConnection \
+ jurt/com/sun/star/lib/connections/pipe/pipeAcceptor \
+ jurt/com/sun/star/lib/connections/pipe/pipeConnector \
+ jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor \
+ jurt/com/sun/star/lib/connections/socket/SocketConnection \
+ jurt/com/sun/star/lib/connections/socket/socketAcceptor \
+ jurt/com/sun/star/lib/connections/socket/socketConnector \
+ jurt/com/sun/star/lib/uno/Proxy \
+ jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject \
+ jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory \
+ jurt/com/sun/star/lib/uno/bridges/java_remote/RequestHandler \
+ jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionInputStream_Adapter \
+ jurt/com/sun/star/lib/uno/bridges/java_remote/XConnectionOutputStream_Adapter \
+ jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge \
+ jurt/com/sun/star/lib/uno/environments/java/java_environment \
+ jurt/com/sun/star/lib/uno/environments/remote/IProtocol \
+ jurt/com/sun/star/lib/uno/environments/remote/IReceiver \
+ jurt/com/sun/star/lib/uno/environments/remote/IThreadPool \
+ jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool \
+ jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory \
+ jurt/com/sun/star/lib/uno/environments/remote/Job \
+ jurt/com/sun/star/lib/uno/environments/remote/JobQueue \
+ jurt/com/sun/star/lib/uno/environments/remote/Message \
+ jurt/com/sun/star/lib/uno/environments/remote/NativeThreadPool \
+ jurt/com/sun/star/lib/uno/environments/remote/ThreadId \
+ jurt/com/sun/star/lib/uno/environments/remote/ThreadPoolManager \
+ jurt/com/sun/star/lib/uno/environments/remote/remote_environment \
+ jurt/com/sun/star/lib/uno/protocols/urp/Cache \
+ jurt/com/sun/star/lib/uno/protocols/urp/Marshal \
+ jurt/com/sun/star/lib/uno/protocols/urp/PendingRequests \
+ jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal \
+ jurt/com/sun/star/lib/uno/protocols/urp/UrpMessage \
+ jurt/com/sun/star/lib/uno/protocols/urp/urp \
+ jurt/com/sun/star/lib/util/AsynchronousFinalizer \
+ jurt/com/sun/star/lib/util/NativeLibraryLoader \
+ jurt/com/sun/star/lib/util/StringHelper \
+ jurt/com/sun/star/lib/util/UrlToFileMapper \
+ jurt/com/sun/star/uno/AnyConverter \
+ jurt/com/sun/star/uno/Ascii \
+ jurt/com/sun/star/uno/AsciiString \
+ jurt/com/sun/star/uno/MappingException \
+ jurt/com/sun/star/uno/WeakReference \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk
new file mode 100644
index 0000000..4a8dfe5
--- /dev/null
+++ b/jurt/Library_jpipe.mk
@@ -0,0 +1,54 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,jpipe))
+
+$(eval $(call gb_Library_add_linked_libs,jpipe,\
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+
+# The real library is called jpipx on Windows. We build only a wrapper
+# for it here.
+$(eval $(call gb_Library_add_cobjects,jpipe,\
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list