Author: damjan
Date: Sat Mar 5 20:44:26 2016
New Revision: 1733761
URL: http://svn.apache.org/viewvc?rev=1733761&view=rev
Log:
Merge 1409482, 1409483, 1409484, 1409486, 1409487, and 1409490
from branches/gbuild.
Also added svidl to Repository.mk to get it to build.
BUILDS
Build updates by: me
Added:
openoffice/branches/gbuild-reintegration/main/idl/Executable_svidl.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/idl/Executable_svidl.mk
openoffice/branches/gbuild-reintegration/main/idl/Makefile
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/idl/Makefile
openoffice/branches/gbuild-reintegration/main/idl/Module_idl.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/idl/Module_idl.mk
openoffice/branches/gbuild-reintegration/main/idl/prj/makefile.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/idl/prj/makefile.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Jar.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/solenv/gbuild/Jar.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Zip.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/solenv/gbuild/Zip.mk
openoffice/branches/gbuild-reintegration/main/wizards/AllLangResTarget_cal.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/AllLangResTarget_cal.mk
openoffice/branches/gbuild-reintegration/main/wizards/AllLangResTarget_dbw.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/AllLangResTarget_dbw.mk
openoffice/branches/gbuild-reintegration/main/wizards/AllLangResTarget_eur.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/AllLangResTarget_eur.mk
openoffice/branches/gbuild-reintegration/main/wizards/AllLangResTarget_imp.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/AllLangResTarget_imp.mk
openoffice/branches/gbuild-reintegration/main/wizards/AllLangResTarget_tpl.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/AllLangResTarget_tpl.mk
openoffice/branches/gbuild-reintegration/main/wizards/AllLangResTarget_wwz.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/AllLangResTarget_wwz.mk
openoffice/branches/gbuild-reintegration/main/wizards/AllLangResTarget_wzi.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/AllLangResTarget_wzi.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_agenda.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Jar_agenda.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_commonwizards.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Jar_commonwizards.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_fax.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Jar_fax.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_form.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Jar_form.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_letter.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Jar_letter.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_query.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Jar_query.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_report.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Jar_report.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_reportbuilder.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Jar_reportbuilder.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_table.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Jar_table.mk
openoffice/branches/gbuild-reintegration/main/wizards/Jar_web.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Jar_web.mk
openoffice/branches/gbuild-reintegration/main/wizards/Makefile
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Makefile
openoffice/branches/gbuild-reintegration/main/wizards/Module_wizards.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Module_wizards.mk
openoffice/branches/gbuild-reintegration/main/wizards/Zip_depot.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Zip_depot.mk
openoffice/branches/gbuild-reintegration/main/wizards/Zip_euro.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Zip_euro.mk
openoffice/branches/gbuild-reintegration/main/wizards/Zip_form.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Zip_form.mk
openoffice/branches/gbuild-reintegration/main/wizards/Zip_gimmicks.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Zip_gimmicks.mk
openoffice/branches/gbuild-reintegration/main/wizards/Zip_import.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Zip_import.mk
openoffice/branches/gbuild-reintegration/main/wizards/Zip_launcher.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Zip_launcher.mk
openoffice/branches/gbuild-reintegration/main/wizards/Zip_schedule.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Zip_schedule.mk
openoffice/branches/gbuild-reintegration/main/wizards/Zip_share.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Zip_share.mk
openoffice/branches/gbuild-reintegration/main/wizards/Zip_standard.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Zip_standard.mk
openoffice/branches/gbuild-reintegration/main/wizards/Zip_template.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Zip_template.mk
openoffice/branches/gbuild-reintegration/main/wizards/Zip_tools.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Zip_tools.mk
openoffice/branches/gbuild-reintegration/main/wizards/Zip_tutorials.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Zip_tutorials.mk
openoffice/branches/gbuild-reintegration/main/wizards/Zip_usr.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Zip_usr.mk
openoffice/branches/gbuild-reintegration/main/wizards/Zip_web.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/Zip_web.mk
openoffice/branches/gbuild-reintegration/main/wizards/prj/makefile.mk
- copied unchanged from r1409490,
incubator/ooo/branches/gbuild/main/wizards/prj/makefile.mk
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
openoffice/branches/gbuild-reintegration/main/Repository.mk
openoffice/branches/gbuild-reintegration/main/idl/prj/build.lst
openoffice/branches/gbuild-reintegration/main/idl/prj/d.lst
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/gbuild.mk
openoffice/branches/gbuild-reintegration/main/swext/mediawiki/build.xml
openoffice/branches/gbuild-reintegration/main/wizards/prj/build.lst
openoffice/branches/gbuild-reintegration/main/wizards/prj/d.lst
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 5 20:44:26 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409425,1409427-1409428,1409430,1409432-1409436,1409438,1409440,1409442,1409444-1409446,1409452,1409454,1409457,1409459-1409460,1409462-1409463,1409465-1409466,1409470
+/incubator/ooo/branches/gbuild:1409313-1409490
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Module_ooo.mk?rev=1733761&r1=1733760&r2=1733761&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Module_ooo.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Module_ooo.mk Sat Mar 5
20:44:26 2016
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,o
drawinglayer \
editeng \
framework \
+ idl \
offapi \
oovbaapi \
oox \
@@ -45,6 +46,7 @@ $(eval $(call gb_Module_add_moduledirs,o
unoxml \
vbahelper \
vcl \
+ wizards \
writerfilter \
xmloff \
formula \
Modified: openoffice/branches/gbuild-reintegration/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Repository.mk?rev=1733761&r1=1733760&r2=1733761&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Repository.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Repository.mk Sat Mar 5
20:44:26 2016
@@ -31,6 +31,7 @@ $(eval $(call gb_Helper_register_executa
mkunroll \
rscdep \
so_checksum \
+ svidl \
sspretty \
))
Modified: openoffice/branches/gbuild-reintegration/main/idl/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/idl/prj/build.lst?rev=1733761&r1=1733760&r2=1733761&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/idl/prj/build.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/idl/prj/build.lst Sat Mar 5
20:44:26 2016
@@ -1,8 +1,2 @@
id idl : tools NULL
-id idl
usr1 - all idl_mkout NULL
-id idl\prj
get - all idl_gprj NULL
-id idl\inc
nmake - all idl_inc NULL
-id idl\source\cmptools nmake
- all idl_cmp idl_inc NULL
-id idl\source\objects nmake
- all idl_obj idl_inc NULL
-id idl\source\prj nmake
- all idl_prj idl_inc NULL
-id idl\util
nmake - all idl_util idl_cmp idl_obj idl_prj NULL
+id idl\prj
nmake - all idl_gprj NULL
Modified: openoffice/branches/gbuild-reintegration/main/idl/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/idl/prj/d.lst?rev=1733761&r1=1733760&r2=1733761&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/idl/prj/d.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/idl/prj/d.lst Sat Mar 5
20:44:26 2016
@@ -1,2 +0,0 @@
-..\%__SRC%\bin\svidl.exe %_DEST%\bin%_EXT%\svidl.exe
-..\%__SRC%\bin\svidl %_DEST%\bin%_EXT%\svidl
Modified:
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk?rev=1733761&r1=1733760&r2=1733761&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
Sat Mar 5 20:44:26 2016
@@ -282,16 +282,16 @@ my_components += \
ScriptProviderForJava \
XMergeBridge \
XSLTValidate \
- agenda \
- fax \
- form \
+ component/wizards/com/sun/star/wizards/agenda/agenda \
+ component/wizards/com/sun/star/wizards/fax/fax \
+ component/wizards/com/sun/star/wizards/form/form \
hsqldb \
jdbc \
- letter \
- query \
- report \
- table \
- web
+ component/wizards/com/sun/star/wizards/letter/letter \
+ component/wizards/com/sun/star/wizards/query/query \
+ component/wizards/com/sun/star/wizards/report/report \
+ component/wizards/com/sun/star/wizards/table/table \
+ component/wizards/com/sun/star/wizards/web/web
.IF "$(ENABLE_BEANSHELL)" == "YES"
my_components += ScriptProviderForBeanShell
.END
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk?rev=1733761&r1=1733760&r2=1733761&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/JavaClassSet.mk
Sat Mar 5 20:44:26 2016
@@ -27,14 +27,16 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACO
define gb_JavaClassSet__command
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
- $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call
gb_JavaClassSet_get_classdir,$(2)) $(3) && \
+ $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call
gb_JavaClassSet_get_classdir,$(2)) $(if $(filter-out $(JARDEPS),$(3)),\
+ $(filter-out $(JARDEPS),$(3)),\
+ $(filter-out $(JARDEPS),$(4))) &&\
touch $(1))
endef
define gb_JavaClassSet__rules
$$(call gb_JavaClassSet_get_repo_target,$(1),%) :
- $$(call gb_JavaClassSet__command,$$@,$$*,$$?)
+ $$(call gb_JavaClassSet__command,$$@,$$*,$$?,$$^)
$$(call gb_JavaClassSet_get_target,%) : $$(call
gb_JavaClassSet_get_repo_target,$(1),%)
$$(call gb_Output_announce,$$*,$$(true),JCS,3)
@@ -48,10 +50,11 @@ $(call gb_JavaClassSet_get_clean_target,
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(dir $(call gb_JavaClassSet_get_target,$*)))
-
$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),$(eval $(call
gb_JavaClassSet__rules,$(reponame))))
+# no initialization of scoped variable CLASSPATH as it is "inherited" from
controlling instance (e.g. JUnitTest, Jar)
define gb_JavaClassSet_JavaClassSet
+$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS :=
endef
define gb_JavaClassSet__get_sourcefile
@@ -61,16 +64,22 @@ endef
define gb_JavaClassSet_add_sourcefile
$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),\
$(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) :
$(call gb_JavaClassSet__get_sourcefile,$($(reponame)),$(2))))
-
endef
define gb_JavaClassSet_add_sourcefiles
$(foreach sourcefile,$(2),$(call
gb_JavaClassSet_add_sourcefile,$(1),$(sourcefile)))
-
endef
define gb_JavaClassSet_set_classpath
$(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2)
+endef
+
+# problem: currently we can't get these dependencies to work
+# build order dependency is a hack to get these prerequisites out of the way
in the build command
+define gb_JavaClassSet_add_jar
+$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),\
+$(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) : $(2))
+$(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) : JARDEPS +=
$(2)))
endef
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk?rev=1733761&r1=1733760&r2=1733761&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/TargetLocations.mk
Sat Mar 5 20:44:26 2016
@@ -25,10 +25,12 @@
gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
-gb_PackagePart_get_destinations = $(OUTDIR)/xml $(OUTDIR)/inc $(OUTDIR)/bin
$(OUTDIR)/idl
+gb_PackagePart_get_destinations = $(OUTDIR)/xml $(OUTDIR)/inc $(OUTDIR)/bin
$(OUTDIR)/idl $(OUTDIR)/pck
gb_PackagePart_get_target = $(OUTDIR)/$(1)
gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
+gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
+gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip
define gb_Library_get_target
$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter
$(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES)))
@@ -52,6 +54,9 @@ gb_GenCxxObject_get_target = $(WORKDIR)/
gb_Executable_get_external_headers_target =
$(WORKDIR)/ExternalHeaders/Executable/$(1)
gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
gb_GoogleTest_get_target = $(WORKDIR)/GoogleTest/$(1).test
+gb_Jar_get_target = $(WORKDIR)/Jar/$(1).jar
+gb_Jar_get_final_target = $(WORKDIR)/Jar/$(1).done
+gb_Jar_get_classsetname = Jar/$(1)
gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1)
gb_JavaClassSet_get_repo_target = $(WORKDIR)/JavaClassSet/$(2)/$(1).done
gb_JavaClassSet_get_target = $(WORKDIR)/JavaClassSet/$(1)/done
@@ -82,6 +87,8 @@ gb_SrsPartMergeTarget_get_target = $(WOR
gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
gb_WinResTarget_get_target =
$(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
+gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip
+gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done
define gb_Library_get_external_headers_target
$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter
$(1):%,$(gb_Library_FILENAMES)))
@@ -103,6 +110,7 @@ $(eval $(call gb_Helper_make_clean_targe
AllLangResTarget \
ComponentTarget \
JavaClassSet \
+ Jar \
JunitTest \
LinkTarget \
Module \
@@ -116,6 +124,7 @@ $(eval $(call gb_Helper_make_clean_targe
GoogleTest \
CustomTarget \
UnoApiTarget \
+ Zip \
))
$(eval $(call gb_Helper_make_outdir_clean_targets,\
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/gbuild.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/gbuild.mk?rev=1733761&r1=1733760&r2=1733761&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/gbuild.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/gbuild.mk Sat
Mar 5 20:44:26 2016
@@ -209,6 +209,8 @@ $(eval $(call gb_Deliver_init))
include $(SOLARENV)/inc/minor.mk
+include $(SOLARENV)/inc/minor.mk
+
# We are using a set of scopes that we might as well call classes.
# It is important to include them in the right order as that is
@@ -239,10 +241,12 @@ include $(foreach class, \
CustomTarget \
PrecompiledHeaders \
GoogleTest \
+ Jar \
JavaClassSet \
JunitTest \
Module \
UnoApiTarget \
+ Zip \
,$(GBUILDDIR)/$(class).mk)
# optional extensions that should never be essential
Modified:
openoffice/branches/gbuild-reintegration/main/swext/mediawiki/build.xml
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/swext/mediawiki/build.xml?rev=1733761&r1=1733760&r2=1733761&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/swext/mediawiki/build.xml
(original)
+++ openoffice/branches/gbuild-reintegration/main/swext/mediawiki/build.xml Sat
Mar 5 20:44:26 2016
@@ -95,7 +95,7 @@
<jar basedir="${classes}" compress="true"
jarfile="${dist}/${target}.jar">
<manifest>
<!-- FIXME: Set Class-Path correctly for the system case !-->
- <attribute name="Class-Path" value="commons-codec-1.9.jar
commons-lang3-3.3.jar commons-httpclient-3.1.jar commons-logging-1.1.3.jar"/>
+ <attribute name="Class-Path"
value="file:///usr/local/share/java/classes/commons-codec.jar
file:///usr/local/share/java/classes/commons-lang.jar
file:///usr/local/share/java/classes/commons-httpclient.jar
file:///usr/local/share/java/classes/commons-logging.jar"/>
<attribute name="RegistrationClassName"
value="com.sun.star.wiki.WikiEditorImpl"/>
</manifest>
</jar>
@@ -126,10 +126,6 @@
<zip destfile="${dist}/${name}.${ext}">
<fileset dir="${out}/misc/${target}/package_tmp"
casesensitive="yes"/>
<fileset dir="${dist}" includes="${target}.jar"
casesensitive="yes"/>
- <file file="${commons-codec-jar}"/>
- <file file="${commons-httpclient-jar}"/>
- <file file="${commons-lang-jar}"/>
- <file file="${commons-logging-jar}"/>
<zipfileset file="src/filter/odt2mediawiki.xsl"
casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
<zipfileset file="src/filter/mediawiki.ott" casesensitive="yes"
fullpath="templates/MediaWiki/mediawiki.ott"/>
<zipfileset dir="${solar.bin}/xslt/export/xsltml"
casesensitive="yes" prefix="filter/math"/>
Modified: openoffice/branches/gbuild-reintegration/main/wizards/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/wizards/prj/build.lst?rev=1733761&r1=1733760&r2=1733761&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/wizards/prj/build.lst
(original)
+++ openoffice/branches/gbuild-reintegration/main/wizards/prj/build.lst Sat Mar
5 20:44:26 2016
@@ -1,28 +1,2 @@
wz wizards : L10N:l10n rsc javaunohelper unoil LIBXSLT:libxslt NULL
-wz wizards\util nmake
- all wz_util NULL
-wz wizards\source\config nmake
- all wz_config NULL
-wz wizards\source\configshare nmake
- all wz_configshare NULL
-wz wizards\source\imagelists nmake
- all wz_imglists NULL
-wz wizards\source\euro nmake
- all wz_eurowiz NULL
-wz wizards\source\formwizard nmake
- all wz_reswiz NULL
-wz wizards\source\gimmicks nmake
- all wz_gimmickswz NULL
-wz wizards\source\importwizard nmake
- all wz_importwiz NULL
-wz wizards\source\schedule nmake
- all wz_schedulewiz NULL
-wz wizards\source\template nmake
- all wz_templatewiz NULL
-wz wizards\source\tools nmake
- all wz_toolswiz NULL
-wz wizards\source\depot nmake
- all wz_depot NULL
-wz wizards\source\tutorials nmake
- all wz_tutorials NULL
-wz wizards\source\standard nmake
- all wz_standard NULL
-wz wizards\com\sun\star\wizards nmake
- all wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\query nmake
- all wz_querywiz wz_formwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\report nmake
- all wz_reportwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\reportbuilder\layout nmake
- all wz_rptlayoutwiz wz_reportwiz NULL
-wz wizards\com\sun\star\wizards\reportbuilder nmake
- all wz_rptbldwiz wz_rptlayoutwiz NULL
-wz wizards\com\sun\star\wizards\table nmake
- all wz_tablewiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\form nmake
- all wz_formwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\letter nmake
- all wz_letterwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\fax nmake
- all wz_faxwiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\agenda nmake
- all wz_agendawiz wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\web\data nmake
- all wz_webdata wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\web\export nmake
- all wz_webexport wz_webdata wz_commonwiz NULL
-wz wizards\com\sun\star\wizards\web nmake
- all wz_webwiz wz_webexport NULL
+wz wizards\prj nmake
- all wz_prj NULL
Modified: openoffice/branches/gbuild-reintegration/main/wizards/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/wizards/prj/d.lst?rev=1733761&r1=1733760&r2=1733761&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/wizards/prj/d.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/wizards/prj/d.lst Sat Mar 5
20:44:26 2016
@@ -1,23 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\pck%_EXT%
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\%__SRC%\bin\wzi*.res %_DEST%\bin%_EXT%\wzi*.res
-..\%__SRC%\bin\dbw*.res %_DEST%\bin%_EXT%\dbw*.res
-..\%__SRC%\bin\tpl*.res %_DEST%\bin%_EXT%\tpl*.res
-..\%__SRC%\bin\imp*.res %_DEST%\bin%_EXT%\imp*.res
-..\%__SRC%\bin\wwz*.res %_DEST%\bin%_EXT%\wwz*.res
-..\%__SRC%\bin\eur*.res %_DEST%\bin%_EXT%\eur*.res
-..\%__SRC%\bin\cal*.res %_DEST%\bin%_EXT%\cal*.res
-..\%__SRC%\bin\com*.res %_DEST%\bin%_EXT%\com*.res
-REM ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\misc\agenda.component %_DEST%\xml%_EXT%\agenda.component
-..\%__SRC%\misc\fax.component %_DEST%\xml%_EXT%\fax.component
-..\%__SRC%\misc\form.component %_DEST%\xml%_EXT%\form.component
-..\%__SRC%\misc\letter.component %_DEST%\xml%_EXT%\letter.component
-..\%__SRC%\misc\query.component %_DEST%\xml%_EXT%\query.component
-..\%__SRC%\misc\report.component %_DEST%\xml%_EXT%\report.component
-..\%__SRC%\misc\table.component %_DEST%\xml%_EXT%\table.component
-..\%__SRC%\misc\web.component %_DEST%\xml%_EXT%\web.component
