You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/03/17 19:55:40 UTC
svn commit: r1735474 - in /openoffice/branches/gbuild-reintegration/main:
Module_ooo.mk sd/Module_sd.mk sd/Package_res.mk sd/prj/d.lst
Author: damjan
Date: Thu Mar 17 18:55:40 2016
New Revision: 1735474
URL: http://svn.apache.org/viewvc?rev=1735474&view=rev
Log:
Fully migrate sd to gbuild, packaging some missing files using gbuild
instead of deliver, and add it to Module_ooo.mk.
Patch by: me
Added:
openoffice/branches/gbuild-reintegration/main/sd/Package_res.mk
Modified:
openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
openoffice/branches/gbuild-reintegration/main/sd/Module_sd.mk
openoffice/branches/gbuild-reintegration/main/sd/prj/d.lst
Modified: openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Module_ooo.mk?rev=1735474&r1=1735473&r2=1735474&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Module_ooo.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Module_ooo.mk Thu Mar 17 18:55:40 2016
@@ -42,6 +42,7 @@ $(eval $(call gb_Module_add_moduledirs,o
padmin \
reportdesign \
sax \
+ sd \
sfx2 \
sot \
starmath \
Modified: openoffice/branches/gbuild-reintegration/main/sd/Module_sd.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/Module_sd.mk?rev=1735474&r1=1735473&r2=1735474&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/Module_sd.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/Module_sd.mk Thu Mar 17 18:55:40 2016
@@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_targets,sd,\
Library_sdui \
Library_sdd \
Library_sdfilt \
+ Package_res \
Package_uiconfig \
Package_xml \
))
Added: openoffice/branches/gbuild-reintegration/main/sd/Package_res.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/Package_res.mk?rev=1735474&view=auto
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/Package_res.mk (added)
+++ openoffice/branches/gbuild-reintegration/main/sd/Package_res.mk Thu Mar 17 18:55:40 2016
@@ -0,0 +1,52 @@
+###############################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+###############################################################
+
+
+
+$(eval $(call gb_Package_Package,sd_res,$(SRCDIR)/sd/res))
+
+$(eval $(call gb_Package_add_file,sd_res,pck/common.inc,webview/common.inc))
+$(eval $(call gb_Package_add_file,sd_res,pck/common.pl,webview/common.pl))
+$(eval $(call gb_Package_add_file,sd_res,pck/edit.asp,webview/edit.asp))
+$(eval $(call gb_Package_add_file,sd_res,pck/edit.pl,webview/edit.pl))
+$(eval $(call gb_Package_add_file,sd_res,pck/editpic.asp,webview/editpic.asp))
+$(eval $(call gb_Package_add_file,sd_res,pck/editpic.pl,webview/editpic.pl))
+$(eval $(call gb_Package_add_file,sd_res,pck/index.pl,webview/index.pl))
+$(eval $(call gb_Package_add_file,sd_res,pck/poll.asp,webview/poll.asp))
+$(eval $(call gb_Package_add_file,sd_res,pck/poll.pl,webview/poll.pl))
+$(eval $(call gb_Package_add_file,sd_res,pck/savepic.asp,webview/savepic.asp))
+$(eval $(call gb_Package_add_file,sd_res,pck/savepic.pl,webview/savepic.pl))
+$(eval $(call gb_Package_add_file,sd_res,pck/show.asp,webview/show.asp))
+$(eval $(call gb_Package_add_file,sd_res,pck/show.pl,webview/show.pl))
+$(eval $(call gb_Package_add_file,sd_res,pck/webcast.asp,webview/webview.asp))
+$(eval $(call gb_Package_add_file,sd_res,pck/webcast.pl,webview/webview.pl))
+
+$(eval $(call gb_Package_add_file,sd_res,pck/glas-blue.zip,buttons/glas-blue.zip))
+$(eval $(call gb_Package_add_file,sd_res,pck/glas-green.zip,buttons/glas-green.zip))
+$(eval $(call gb_Package_add_file,sd_res,pck/glas-red.zip,buttons/glas-red.zip))
+$(eval $(call gb_Package_add_file,sd_res,pck/round-gorilla.zip,buttons/round-gorilla.zip))
+$(eval $(call gb_Package_add_file,sd_res,pck/round-white.zip,buttons/round-white.zip))
+$(eval $(call gb_Package_add_file,sd_res,pck/simple.zip,buttons/simple.zip))
+$(eval $(call gb_Package_add_file,sd_res,pck/square-blue.zip,buttons/square-blue.zip))
+$(eval $(call gb_Package_add_file,sd_res,pck/square-gray.zip,buttons/square-gray.zip))
+$(eval $(call gb_Package_add_file,sd_res,pck/square-green.zip,buttons/square-green.zip))
+$(eval $(call gb_Package_add_file,sd_res,pck/square-red.zip,buttons/square-red.zip))
+$(eval $(call gb_Package_add_file,sd_res,pck/square-yellow.zip,buttons/square-yellow.zip))
Modified: openoffice/branches/gbuild-reintegration/main/sd/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sd/prj/d.lst?rev=1735474&r1=1735473&r2=1735474&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/sd/prj/d.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/sd/prj/d.lst Thu Mar 17 18:55:40 2016
@@ -1,53 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sdraw\statusbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%COMMON_OUTDIR%\srs\core_srs.hid %COMMON_DEST%\res%_EXT%\sdcore_srs.hid
-
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\lib\sdi.lib %_DEST%\lib%_EXT%\sdi.lib
-..\%__SRC%\slb\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\bin\sd?????.dll %_DEST%\bin%_EXT%\sd?????.dll
-..\%__SRC%\bin\sd??????.dll %_DEST%\bin%_EXT%\sd??????.dll
-..\%__SRC%\bin\sd*.res %_DEST%\bin%_EXT%\sd*.res
-..\%__SRC%\bin\sd???????.dll %_DEST%\bin%_EXT%\sd???????.dll
-..\%__SRC%\bin\emp?????.* %_DEST%\bin%_EXT%\emp?????.*
-
-mkdir: %_DEST%\pck%_EXT%
-..\res\webview\common.inc %_DEST%\pck%_EXT%\common.inc
-..\res\webview\common.pl %_DEST%\pck%_EXT%\common.pl
-..\res\webview\edit.asp %_DEST%\pck%_EXT%\edit.asp
-..\res\webview\edit.pl %_DEST%\pck%_EXT%\edit.pl
-..\res\webview\editpic.asp %_DEST%\pck%_EXT%\editpic.asp
-..\res\webview\editpic.pl %_DEST%\pck%_EXT%\editpic.pl
-..\res\webview\index.pl %_DEST%\pck%_EXT%\index.pl
-..\res\webview\poll.asp %_DEST%\pck%_EXT%\poll.asp
-..\res\webview\poll.pl %_DEST%\pck%_EXT%\poll.pl
-..\res\webview\savepic.asp %_DEST%\pck%_EXT%\savepic.asp
-..\res\webview\savepic.pl %_DEST%\pck%_EXT%\savepic.pl
-..\res\webview\show.asp %_DEST%\pck%_EXT%\show.asp
-..\res\webview\show.pl %_DEST%\pck%_EXT%\show.pl
-..\res\webview\webview.asp %_DEST%\pck%_EXT%\webcast.asp
-..\res\webview\webview.pl %_DEST%\pck%_EXT%\webcast.pl
-
-..\res\buttons\*.zip %_DEST%\pck%_EXT%\*.zip
-
-mkdir: %_DEST%\inc%_EXT%\sd
-..\inc\sddll.hxx %_DEST%\inc%_EXT%\sd\sddll.hxx
-
-..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
-
-
-..\%__SRC%\misc\sd.component %_DEST%\xml%_EXT%\sd.component
-..\%__SRC%\misc\sdd.component %_DEST%\xml%_EXT%\sdd.component