openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1853585 - in /openoffice/branches/AOO42X: ./ main/ main/i18npool/ main/packimages/ main/packimages/prj/ main/postprocess/packcomponents/ main/python/ main/python/prj/ main/pyuno/ main/pyuno/demo/ main/pyuno/inc/pyuno/ main/pyuno/prj/ main/...
Date Thu, 14 Feb 2019 14:31:50 GMT
Author: jim
Date: Thu Feb 14 14:31:49 2019
New Revision: 1853585

URL: http://svn.apache.org/viewvc?rev=1853585&view=rev
Log:
Merge r1853252, r1853285, r1853286, r1853299, r1853327, r1853456, r1853466, r1853558 from
trunk:

Port main/pyuno to gbuild.

Patch by: me



Allow handling multiple components like dmake did.

Patch by: me



Port main/ure to gbuild.

Patch by: me



Port main/packimages to gbuild.

Patch by: me



The Windows DLL for pyuno should apparently be called pyuno.pyd.

Patch by: me



Link to libdl.so on Linux/Solaris/MacOSX.

Patch by: me



balance parens here in ifeq


Fix a regression in 1853299 caused by a path and pattern match rule
in main/packages that were wrong.

Patch by: me


Submitted by: damjan, jim, damjan
Reviewed by: jim

Added:
    openoffice/branches/AOO42X/main/packimages/Makefile
      - copied unchanged from r1853299, openoffice/trunk/main/packimages/Makefile
    openoffice/branches/AOO42X/main/packimages/Module_packimages.mk
      - copied unchanged from r1853299, openoffice/trunk/main/packimages/Module_packimages.mk
    openoffice/branches/AOO42X/main/packimages/Package_packimages.mk
      - copied, changed from r1853299, openoffice/trunk/main/packimages/Package_packimages.mk
    openoffice/branches/AOO42X/main/packimages/prj/makefile.mk
      - copied unchanged from r1853299, openoffice/trunk/main/packimages/prj/makefile.mk
    openoffice/branches/AOO42X/main/python/pyversion_dmake.mk
      - copied unchanged from r1853252, openoffice/trunk/main/python/pyversion_dmake.mk
    openoffice/branches/AOO42X/main/pyuno/Executable_pyuno_python_exe.mk
      - copied unchanged from r1853252, openoffice/trunk/main/pyuno/Executable_pyuno_python_exe.mk
    openoffice/branches/AOO42X/main/pyuno/Library_pythonloader.mk
      - copied unchanged from r1853252, openoffice/trunk/main/pyuno/Library_pythonloader.mk
    openoffice/branches/AOO42X/main/pyuno/Library_pyuno.mk
      - copied unchanged from r1853252, openoffice/trunk/main/pyuno/Library_pyuno.mk
    openoffice/branches/AOO42X/main/pyuno/Library_pyuno_loader.mk
      - copied, changed from r1853252, openoffice/trunk/main/pyuno/Library_pyuno_loader.mk
    openoffice/branches/AOO42X/main/pyuno/Makefile
      - copied unchanged from r1853252, openoffice/trunk/main/pyuno/Makefile
    openoffice/branches/AOO42X/main/pyuno/Module_pyuno.mk
      - copied unchanged from r1853252, openoffice/trunk/main/pyuno/Module_pyuno.mk
    openoffice/branches/AOO42X/main/pyuno/Package_py.mk
      - copied unchanged from r1853252, openoffice/trunk/main/pyuno/Package_py.mk
    openoffice/branches/AOO42X/main/pyuno/Package_python_bin.mk
      - copied unchanged from r1853252, openoffice/trunk/main/pyuno/Package_python_bin.mk
    openoffice/branches/AOO42X/main/pyuno/Package_pyuno_ini.mk
      - copied unchanged from r1853252, openoffice/trunk/main/pyuno/Package_pyuno_ini.mk
    openoffice/branches/AOO42X/main/pyuno/Package_pyuno_python_sh.mk
      - copied unchanged from r1853252, openoffice/trunk/main/pyuno/Package_pyuno_python_sh.mk
    openoffice/branches/AOO42X/main/pyuno/Package_zipcore.mk
      - copied unchanged from r1853252, openoffice/trunk/main/pyuno/Package_zipcore.mk
    openoffice/branches/AOO42X/main/pyuno/prj/makefile.mk
      - copied unchanged from r1853252, openoffice/trunk/main/pyuno/prj/makefile.mk
    openoffice/branches/AOO42X/main/ure/Makefile
      - copied unchanged from r1853286, openoffice/trunk/main/ure/Makefile
    openoffice/branches/AOO42X/main/ure/Module_ure.mk
      - copied unchanged from r1853286, openoffice/trunk/main/ure/Module_ure.mk
    openoffice/branches/AOO42X/main/ure/Package_services_rdb.mk
      - copied unchanged from r1853286, openoffice/trunk/main/ure/Package_services_rdb.mk
    openoffice/branches/AOO42X/main/ure/Package_ure.mk
      - copied unchanged from r1853286, openoffice/trunk/main/ure/Package_ure.mk
    openoffice/branches/AOO42X/main/ure/Package_uretest_zip.mk
      - copied unchanged from r1853286, openoffice/trunk/main/ure/Package_uretest_zip.mk
    openoffice/branches/AOO42X/main/ure/prj/makefile.mk
      - copied unchanged from r1853286, openoffice/trunk/main/ure/prj/makefile.mk
    openoffice/branches/AOO42X/main/ure/source/services.input
      - copied unchanged from r1853286, openoffice/trunk/main/ure/source/services.input
Modified:
    openoffice/branches/AOO42X/   (props changed)
    openoffice/branches/AOO42X/main/Module_ooo.mk
    openoffice/branches/AOO42X/main/Repository.mk
    openoffice/branches/AOO42X/main/RepositoryExternal.mk
    openoffice/branches/AOO42X/main/RepositoryFixes.mk
    openoffice/branches/AOO42X/main/i18npool/Library_localedata_en.mk
    openoffice/branches/AOO42X/main/packimages/prj/build.lst
    openoffice/branches/AOO42X/main/packimages/prj/d.lst
    openoffice/branches/AOO42X/main/postprocess/packcomponents/makefile.mk
    openoffice/branches/AOO42X/main/python/makefile.mk
    openoffice/branches/AOO42X/main/python/prj/d.lst
    openoffice/branches/AOO42X/main/python/pyversion.mk
    openoffice/branches/AOO42X/main/pyuno/demo/makefile.mk
    openoffice/branches/AOO42X/main/pyuno/inc/pyuno/pyuno.hxx
    openoffice/branches/AOO42X/main/pyuno/prj/build.lst
    openoffice/branches/AOO42X/main/pyuno/prj/d.lst
    openoffice/branches/AOO42X/main/pyuno/source/loader/pyuno_loader.cxx
    openoffice/branches/AOO42X/main/pyuno/source/module/pyuno_dlopenwrapper.c
    openoffice/branches/AOO42X/main/scp2/source/python/makefile.mk
    openoffice/branches/AOO42X/main/testtools/source/bridgetest/pyuno/makefile.mk
    openoffice/branches/AOO42X/main/ure/prj/build.lst
    openoffice/branches/AOO42X/main/ure/prj/d.lst

Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 14 14:31:49 2019
@@ -9,4 +9,4 @@
 /openoffice/branches/ia2:1417739-1541842
 /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
 /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853319,1853443-1853444,1853504
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558

Modified: openoffice/branches/AOO42X/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/Module_ooo.mk?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/Module_ooo.mk (original)
+++ openoffice/branches/AOO42X/main/Module_ooo.mk Thu Feb 14 14:31:49 2019
@@ -72,8 +72,10 @@ $(eval $(call gb_Module_add_moduledirs,o
 	oovbaapi \
 	oox \
 	package \
+	packimages \
 	padmin \
 	psprint_config \
+	pyuno \
 	rdbmaker \
 	registry \
 	remotebridges \
@@ -108,6 +110,7 @@ $(eval $(call gb_Module_add_moduledirs,o
 	unodevtools \
 	unotools \
 	unoxml \
+	ure \
 	uui \
 	vbahelper \
 	vcl \

Modified: openoffice/branches/AOO42X/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/Repository.mk?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/Repository.mk (original)
+++ openoffice/branches/AOO42X/main/Repository.mk Thu Feb 14 14:31:49 2019
@@ -143,6 +143,8 @@ $(eval $(call gb_Helper_register_librari
 	odbcbase \
 	oox \
 	package2 \
+	pyuno \
+	pyuno_loader \
 	qstart_gtk \
 	rpt \
 	rptui \
@@ -269,6 +271,7 @@ $(eval $(call gb_Helper_register_librari
 	lnth \
 	nullcanvas \
 	passwordcontainer \
+	pythonloader \
 	simplecanvas \
 	slideshow \
 	spell \

Modified: openoffice/branches/AOO42X/main/RepositoryExternal.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/RepositoryExternal.mk?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/RepositoryExternal.mk (original)
+++ openoffice/branches/AOO42X/main/RepositoryExternal.mk Thu Feb 14 14:31:49 2019
@@ -702,4 +702,35 @@ endef
 
 endif # SYSTEM_HUNSPELL
 
+
+
+ifeq ($(SYSTEM_PYTHON),YES)
+
+define gb_LinkTarget__use_python
+$(call gb_LinkTarget_set_include,$(1),\
+        $$(INCLUDE) \
+        $(filter -I%,$(PYTHON_CFLAGS)) \
+)
+$(call gb_LinkTarget_add_defs,$(1),\
+        $(filter-out -I%,$(PYTHON_CFLAGS)) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+        $(PYTHON_LIBS) \
+)
+endef
+
+else # !SYSTEM_PYTHON
+
+include $(SRCDIR)/python/pyversion.mk
+
+define gb_LinkTarget__use_python
+$(call gb_LinkTarget_set_include,$(1),\
+        $$(INCLUDE) \
+        -I$(OUTDIR)/inc/python \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(PYTHONLIB))
+endef
+
+endif # SYSTEM_PYTHON
+
 # vim: set noet sw=4 ts=4:

Modified: openoffice/branches/AOO42X/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/RepositoryFixes.mk?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/RepositoryFixes.mk (original)
+++ openoffice/branches/AOO42X/main/RepositoryFixes.mk Thu Feb 14 14:31:49 2019
@@ -33,6 +33,7 @@ gb_Library_FILENAMES := $(patsubst hyphe
 gb_Library_FILENAMES := $(patsubst lnth:lnth.uno%,lnth:liblnth.uno%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst pyuno_loader:libpyuno%,pyuno_loader:pyuno.so,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
@@ -52,6 +53,7 @@ gb_Library_FILENAMES := $(patsubst cppuh
 gb_Library_FILENAMES := $(patsubst hyphen_uno:hyphen_uno.uno%,hyphen_uno:libhyphen.uno%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst lnth:lnth.uno%,lnth:liblnth.uno%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst pyuno_loader:libpyuno%,pyuno_loader:pyuno.so,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))
@@ -68,6 +70,8 @@ gb_Library_FILENAMES := $(patsubst cppuh
 gb_Library_FILENAMES := $(patsubst hyphen_uno:hyphen_uno.uno%,hyphen_uno:libhyphen.uno%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst lnth:lnth.uno%,lnth:liblnth.uno%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+# pyuno.so even on Mac OS X, because it is a python module
+gb_Library_FILENAMES := $(patsubst pyuno_loader:libpyuno%,pyuno_loader:pyuno.so,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))
@@ -164,6 +168,7 @@ gb_Library_FILENAMES := $(patsubst z:z%,
 
 gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst hyphen_uno:hyphen_uno.uno%,hyphen_uno:hyphen.uno%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst pyuno:%,pyuno:pyuno.pyd,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
 endif # ifneq ($(USE_MINGW),)
@@ -251,6 +256,7 @@ gb_Library_FILENAMES := $(patsubst lnth:
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst pyuno_loader:libpyuno%,pyuno_loader:pyuno.so,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))

Modified: openoffice/branches/AOO42X/main/i18npool/Library_localedata_en.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/Library_localedata_en.mk?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/Library_localedata_en.mk (original)
+++ openoffice/branches/AOO42X/main/i18npool/Library_localedata_en.mk Thu Feb 14 14:31:49
2019
@@ -79,12 +79,12 @@ $(WORKDIR)/CustomTarget/i18npool/source/
 		$(call gb_Helper_convert_native,$(OUTDIR)/bin/types.rdb) \
 		-env:OOO_INBUILD_SHAREDLIB_DIR=$(URL_PROTOCOL)$(call gb_Helper_convert_native,$(gb_InBuild_Library_Path))
 
-MY_COMPONENT := sax/source/expatwrap/expwrap
+MY_COMPONENTS := component/sax/source/expatwrap/expwrap
 
 $(WORKDIR)/CustomTarget/i18npool/source/localedata/data/saxparser.rdb : \
 			$(WORKDIR)/CustomTarget/i18npool/source/localedata/data/saxparser.input \
 			$(SOLARENV)/bin/packcomponents.xslt \
-			$(call gb_ComponentTarget_get_outdir_inbuild_target,$(MY_COMPONENT))
+			$(foreach component,$(MY_COMPONENTS),$(OUTDIR)/xml/$(component).inbuild.component)
 	$(gb_XSLTPROC) \
 		--nonet \
 		--stringparam prefix $(call gb_Helper_convert_native,$(OUTDIR)/xml/) \
@@ -94,7 +94,7 @@ $(WORKDIR)/CustomTarget/i18npool/source/
 
 $(WORKDIR)/CustomTarget/i18npool/source/localedata/data/saxparser.input :
 	mkdir -p $(dir $@) \
-	&& echo "<list><filename>component/$(MY_COMPONENT).inbuild.component</filename></list>"
> $@
+	&& echo "<list>$(foreach component,$(MY_COMPONENTS),<filename>$(component).inbuild.component</filename>)</list>"
> $@
 
 # vim: set noet sw=4 ts=4:
 

Copied: openoffice/branches/AOO42X/main/packimages/Package_packimages.mk (from r1853299, openoffice/trunk/main/packimages/Package_packimages.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/packimages/Package_packimages.mk?p2=openoffice/branches/AOO42X/main/packimages/Package_packimages.mk&p1=openoffice/trunk/main/packimages/Package_packimages.mk&r1=1853299&r2=1853585&rev=1853585&view=diff
==============================================================================
--- openoffice/trunk/main/packimages/Package_packimages.mk (original)
+++ openoffice/branches/AOO42X/main/packimages/Package_packimages.mk Thu Feb 14 14:31:49 2019
@@ -53,10 +53,10 @@ $(WORKDIR)/CustomTarget/packimages/bin/i
 		-c $(SRCDIR)/packimages \
 		-l $(OUTDIR)/res/img \
 		-s $(SORTED_LIST) \
-		-l $(OUTDIR)/res/img \
+		-l $(WORKDIR)/CustomTarget/packimages/res/img \
 		-o $@
 
-$(WORKDIR)/CustomTarget/packimages/bin/images_% : $(COMMAND_IMAGE_LIST)
+$(WORKDIR)/CustomTarget/packimages/bin/images_%.zip : $(COMMAND_IMAGE_LIST)
 	mkdir -p $(dir $@) && \
 	$(PERL) $(SOLARENV)/bin/packimages.pl \
 		$(VERBOSESWITCH) \

Modified: openoffice/branches/AOO42X/main/packimages/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/packimages/prj/build.lst?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/packimages/prj/build.lst (original)
+++ openoffice/branches/AOO42X/main/packimages/prj/build.lst Thu Feb 14 14:31:49 2019
@@ -1,3 +1,2 @@
 pim	packimages	::	postprocess NULL
-pim	packimages						usr1	-	all	pim_mkout NULL
-pim	packimages\pack				nmake	-	all	pim_pack NULL
+pim	packimages\prj				nmake	-	all	pim_prj NULL

Modified: openoffice/branches/AOO42X/main/packimages/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/packimages/prj/d.lst?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/packimages/prj/d.lst (original)
+++ openoffice/branches/AOO42X/main/packimages/prj/d.lst Thu Feb 14 14:31:49 2019
@@ -1,2 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%
-..\%__SRC%\bin\*.zip %COMMON_DEST%\bin%_EXT%

Modified: openoffice/branches/AOO42X/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/postprocess/packcomponents/makefile.mk?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/postprocess/packcomponents/makefile.mk Thu Feb 14 14:31:49
2019
@@ -96,6 +96,7 @@ my_components = \
     component/oox/util/oox \
     component/package/source/xstor/xstor \
     component/package/util/package2 \
+    component/pyuno/source/loader/pythonloader \
 	component/reportdesign/util/rptxml \
 	component/reportdesign/util/rpt \
 	component/reportdesign/util/rptui \
@@ -175,7 +176,6 @@ my_components = \
     placeware \
     preload \
     protocolhandler \
-    pythonloader \
     pythonscript \
     res \
     scn \

Modified: openoffice/branches/AOO42X/main/python/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/python/makefile.mk?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/python/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/python/makefile.mk Thu Feb 14 14:31:49 2019
@@ -29,7 +29,7 @@ TARGET=so_python
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-.INCLUDE :      pyversion.mk
+.INCLUDE :      pyversion_dmake.mk
 
 .IF "$(SYSTEM_PYTHON)" == "YES"
 all:
@@ -137,6 +137,7 @@ BUILD_ACTION=$(COMPATH)$/vcpackages$/vcb
 .ENDIF
 .ENDIF
 
+PYVERSIONFILE_DMAKE=$(MISC)$/pyversion_dmake.mk
 PYVERSIONFILE=$(MISC)$/pyversion.mk
 
 # --- Targets ------------------------------------------------------
@@ -160,10 +161,14 @@ $(PYCONFIG) : $(MISC)$/build$/$(TARFILE_
 .ENDIF
 .ENDIF
 
-ALLTAR : $(PYVERSIONFILE)
+ALLTAR : $(PYVERSIONFILE_DMAKE) $(PYVERSIONFILE)
 .ENDIF          # "$(L10N_framework)"==""
 
 
+$(PYVERSIONFILE_DMAKE) : pyversion_dmake.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+	-rm -f $@
+	cat $? > $@
+
 $(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
 	-rm -f $@
 	cat $? > $@

Modified: openoffice/branches/AOO42X/main/python/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/python/prj/d.lst?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/python/prj/d.lst (original)
+++ openoffice/branches/AOO42X/main/python/prj/d.lst Thu Feb 14 14:31:49 2019
@@ -75,6 +75,7 @@ mkdir: %_DEST%\lib%_EXT%\python\python2.
 ..\%__SRC%\misc\build\Python-2.7.15\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile
 ..\%__SRC%\misc\build\python-inst\lib\python2.7\_sysconfigdata.py %_DEST%\lib%_EXT%\python\_sysconfigdata.py
 ..\pyversion.mk %_DEST%\inc%_EXT%\pyversion.mk
+..\pyversion_dmake.mk %_DEST%\inc%_EXT%\pyversion_dmake.mk
 
 ..\%__SRC%\misc\build\Python-2.7.15\Include\* %_DEST%\inc%_EXT%\python\*
 

Modified: openoffice/branches/AOO42X/main/python/pyversion.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/python/pyversion.mk?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/python/pyversion.mk (original)
+++ openoffice/branches/AOO42X/main/python/pyversion.mk Thu Feb 14 14:31:49 2019
@@ -25,22 +25,22 @@ PYMINOR=7
 PYMICRO=15
 PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
 
-.IF "$(GUI)" == "UNX"
-.IF "$(OS)" == "MACOSX"
+ifeq ($(GUI),UNX)
+ifeq ($(OS),MACOSX)
 PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dylib
-.ELSE
+else
 PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).so.1.0
-.ENDIF
+endif
 PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR)
-.ELIF "$(GUI)" == "OS2"
+else ifeq ($(GUI),OS2)
 PY_FULL_DLL_NAME=python$(PYMAJOR)$(PYMINOR).dll
 PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
-.ELSE
-.IF "$(COM)" == "GCC"
+else
+ifeq ($(COM),GCC)
 PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dll
 PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR)
-.ELSE
+else
 PY_FULL_DLL_NAME=python$(PYMAJOR)$(PYMINOR).dll
 PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
-.ENDIF
-.ENDIF
+endif
+endif

Copied: openoffice/branches/AOO42X/main/pyuno/Library_pyuno_loader.mk (from r1853252, openoffice/trunk/main/pyuno/Library_pyuno_loader.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/pyuno/Library_pyuno_loader.mk?p2=openoffice/branches/AOO42X/main/pyuno/Library_pyuno_loader.mk&p1=openoffice/trunk/main/pyuno/Library_pyuno_loader.mk&r1=1853252&r2=1853585&rev=1853585&view=diff
==============================================================================
--- openoffice/trunk/main/pyuno/Library_pyuno_loader.mk (original)
+++ openoffice/branches/AOO42X/main/pyuno/Library_pyuno_loader.mk Thu Feb 14 14:31:49 2019
@@ -30,6 +30,14 @@ $(eval $(call gb_Library_set_include,pyu
 	-I$(SRCDIR)/pyuno/inc \
 ))
 
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_libs,pyuno_loader,-ldl))
+else ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Library_add_libs,pyuno_loader,-ldl))
+else ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_libs,pyuno_loader,-ldl))
+endif
+
 $(eval $(call gb_Library_add_cobjects,pyuno_loader,\
 	pyuno/source/module/pyuno_dlopenwrapper \
 ))

Modified: openoffice/branches/AOO42X/main/pyuno/demo/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/pyuno/demo/makefile.mk?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/pyuno/demo/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/pyuno/demo/makefile.mk Thu Feb 14 14:31:49 2019
@@ -22,7 +22,7 @@ PRJNAME=pyuno
 PRJ=..
 
 .INCLUDE : settings.mk
-.INCLUDE : pyversion.mk
+.INCLUDE : pyversion_dmake.mk
 
 ROOT=$(MISC)$/pyuno-doc
 

Modified: openoffice/branches/AOO42X/main/pyuno/inc/pyuno/pyuno.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/pyuno/inc/pyuno/pyuno.hxx?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/pyuno/inc/pyuno/pyuno.hxx (original)
+++ openoffice/branches/AOO42X/main/pyuno/inc/pyuno/pyuno.hxx Thu Feb 14 14:31:49 2019
@@ -68,11 +68,7 @@
    to do the necessary conversions.
 */
 
-#ifdef WIN32
-#define PY_DLLEXPORT __declspec(dllexport) 
-#else
-#define PY_DLLEXPORT
-#endif
+#define PY_DLLEXPORT SAL_DLLPUBLIC_EXPORT
 
 /** function called by the python runtime to initialize the
     pyuno module.

Modified: openoffice/branches/AOO42X/main/pyuno/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/pyuno/prj/build.lst?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/pyuno/prj/build.lst (original)
+++ openoffice/branches/AOO42X/main/pyuno/prj/build.lst Thu Feb 14 14:31:49 2019
@@ -1,5 +1,2 @@
 bgpu	pyuno	:	stoc cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL
-pu	pyuno				  usr1	-	all	br_mkout NULL
-pu	pyuno\zipcore	nmake	-	all	pu_zipcore NULL
-pu	pyuno\source\module	nmake	-	all	pu_module NULL
-pu	pyuno\source\loader	nmake	-	all	pu_loader pu_module NULL
+pu	pyuno\prj	nmake	-	all	pu_prj NULL

Modified: openoffice/branches/AOO42X/main/pyuno/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/pyuno/prj/d.lst?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/pyuno/prj/d.lst (original)
+++ openoffice/branches/AOO42X/main/pyuno/prj/d.lst Thu Feb 14 14:31:49 2019
@@ -1,26 +0,0 @@
-mkdir: %_DEST%\bin%_EXT%\pyuno
-mkdir: %_DEST%\lib%_EXT%\pyuno
-
-..\%__SRC%\lib\libpyuno.so %_DEST%\lib%_EXT%\libpyuno.so
-..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib%_EXT%\libpyuno.dylib
-..\%__SRC%\lib\pyuno.so %_DEST%\lib%_EXT%\pyuno.so
-..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib%_EXT%\pythonloader.uno.so
-..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib%_EXT%\pythonloader.uno.dylib
-..\%__SRC%\lib\unohelper.py %_DEST%\lib%_EXT%\pyuno\unohelper.py
-..\%__SRC%\lib\pythonloader.py %_DEST%\lib%_EXT%\pyuno\pythonloader.py
-..\%__SRC%\lib\uno.py %_DEST%\lib%_EXT%\pyuno\uno.py
-..\%__SRC%\misc\pythonloader.component %_DEST%\xml\pythonloader.component
-
-..\%__SRC%\bin\unohelper.py %_DEST%\bin%_EXT%\pyuno\unohelper.py
-..\%__SRC%\bin\pythonloader.py %_DEST%\bin%_EXT%\pyuno\pythonloader.py
-..\%__SRC%\bin\uno.py %_DEST%\bin%_EXT%\pyuno\uno.py
-..\%__SRC%\bin\pyuno.pyd %_DEST%\bin%_EXT%\pyuno.pyd
-..\%__SRC%\bin\pyuno.dll %_DEST%\bin%_EXT%\pyuno.dll
-..\%__SRC%\bin\pythonl*.dll %_DEST%\bin%_EXT%\pythonl*.dll
-
-..\%__SRC%\misc\pyunorc %_DEST%\lib%_EXT%\pyunorc
-..\%__SRC%\misc\pyuno.ini %_DEST%\bin%_EXT%\pyuno.ini
-..\%__SRC%\bin\python-core-*.zip %_DEST%\bin%_EXT%\python-core-*.zip
-..\%__SRC%\bin\python.bin %_DEST%\bin%_EXT%\python.bin
-..\%__SRC%\bin\python.sh %_DEST%\bin%_EXT%\pyuno\python
-..\%__SRC%\bin\python.exe %_DEST%\bin%_EXT%\pyuno\python.exe

Modified: openoffice/branches/AOO42X/main/pyuno/source/loader/pyuno_loader.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/pyuno/source/loader/pyuno_loader.cxx?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/pyuno/source/loader/pyuno_loader.cxx (original)
+++ openoffice/branches/AOO42X/main/pyuno/source/loader/pyuno_loader.cxx Thu Feb 14 14:31:49
2019
@@ -219,13 +219,13 @@ extern "C"
 {
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
 	const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
 	*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
 	const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
 	return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries
);

Modified: openoffice/branches/AOO42X/main/pyuno/source/module/pyuno_dlopenwrapper.c
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/pyuno/source/module/pyuno_dlopenwrapper.c?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/pyuno/source/module/pyuno_dlopenwrapper.c (original)
+++ openoffice/branches/AOO42X/main/pyuno/source/module/pyuno_dlopenwrapper.c Thu Feb 14 14:31:49
2019
@@ -33,7 +33,7 @@
 #endif
 #include <dlfcn.h>
 
-void initpyuno ()
+SAL_DLLPUBLIC_EXPORT void initpyuno ()
 {
     Dl_info dl_info;
     void (*func)(void);

Modified: openoffice/branches/AOO42X/main/scp2/source/python/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/scp2/source/python/makefile.mk?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/scp2/source/python/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/scp2/source/python/makefile.mk Thu Feb 14 14:31:49 2019
@@ -36,7 +36,7 @@ TARGETTYPE=CUI
 .IF "$(SYSTEM_PYTHON)" == "YES"
 SCPDEFS+=-DSYSTEM_PYTHON
 .ELSE
-.INCLUDE :      pyversion.mk
+.INCLUDE :      pyversion_dmake.mk
 .ENDIF
 
 SCPDEFS+=\

Modified: openoffice/branches/AOO42X/main/testtools/source/bridgetest/pyuno/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/testtools/source/bridgetest/pyuno/makefile.mk?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/testtools/source/bridgetest/pyuno/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/testtools/source/bridgetest/pyuno/makefile.mk Thu Feb
14 14:31:49 2019
@@ -29,7 +29,7 @@ LIBTARGET=NO
 TARGETTYPE=CUI
 ENABLE_EXCEPTIONS=TRUE
 
-my_components = pythonloader
+my_components = component/pyuno/source/loader/pythonloader
 
 # --- Settings -----------------------------------------------------
 

Modified: openoffice/branches/AOO42X/main/ure/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/ure/prj/build.lst?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/ure/prj/build.lst (original)
+++ openoffice/branches/AOO42X/main/ure/prj/build.lst Thu Feb 14 14:31:49 2019
@@ -1,2 +1,2 @@
 ur ure : LIBXSLT:libxslt binaryurp cli_ure io javaunohelper remotebridges solenv stoc NULL
-ur ure\source nmake - all ur_source NULL
+ur ure\prj nmake - all ur_prj NULL

Modified: openoffice/branches/AOO42X/main/ure/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/ure/prj/d.lst?rev=1853585&r1=1853584&r2=1853585&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/ure/prj/d.lst (original)
+++ openoffice/branches/AOO42X/main/ure/prj/d.lst Thu Feb 14 14:31:49 2019
@@ -1,10 +0,0 @@
-mkdir: %_DEST%\bin%_EXT%\ure
-mkdir: %_DEST%\xml%_EXT%\ure
-..\%__SRC%\bin\uretest.zip %COMMON_DEST%\bin%_EXT%\uretest.zip
-..\%__SRC%\misc\services.rdb %_DEST%\xml%_EXT%\ure\services.rdb
-..\source\README %_DEST%\bin%_EXT%\ure\README
-..\source\jvmfwk3.ini %_DEST%\bin%_EXT%\ure\jvmfwk3.ini
-..\source\jvmfwk3rc %_DEST%\bin%_EXT%\ure\jvmfwk3rc
-..\source\startup.sh %_DEST%\bin%_EXT%\ure\startup.sh
-..\source\uno.ini %_DEST%\bin%_EXT%\ure\uno.ini
-..\source\unorc %_DEST%\bin%_EXT%\ure\unorc



Mime
View raw message