Author: damjan
Date: Thu Mar 29 00:45:19 2018
New Revision: 1827953
URL: http://svn.apache.org/viewvc?rev=1827953&view=rev
Log:
Port main/twain to gbuild.
Update Module_ooo.mk.
Patch by: me
Added:
openoffice/trunk/main/twain/Makefile (with props)
openoffice/trunk/main/twain/Module_twain.mk
openoffice/trunk/main/twain/Package_inc.mk
openoffice/trunk/main/twain/prj/makefile.mk
Removed:
openoffice/trunk/main/twain/util/
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/twain/prj/build.lst
openoffice/trunk/main/twain/prj/d.lst
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1827953&r1=1827952&r2=1827953&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Thu Mar 29 00:45:19 2018
@@ -27,6 +27,7 @@ $(eval $(call gb_Module_add_moduledirs,o
MathMLDTD \
UnoControls \
animations \
+ autodoc \
automation \
avmedia \
basctl \
@@ -36,6 +37,7 @@ $(eval $(call gb_Module_add_moduledirs,o
canvas \
comphelper \
configmgr \
+ cosv \
cppcanvas \
cui \
dbaccess \
@@ -52,17 +54,18 @@ $(eval $(call gb_Module_add_moduledirs,o
idl \
io \
javaunohelper \
+ jvmaccess \
linguistic \
o3tl \
offapi \
oovbaapi \
oox \
- padmin \
package \
+ padmin \
rdbmaker \
registry \
- reportdesign \
remotebridges \
+ reportdesign \
sane \
sax \
sc \
@@ -80,15 +83,19 @@ $(eval $(call gb_Module_add_moduledirs,o
sw \
toolkit \
tools \
+ twain \
+ ucb \
ucbhelper \
udkapi \
+ udm \
+ unixODBC \
+ unodevtools \
unotools \
unoxml \
uui \
vbahelper \
vcl \
- udm \
- unixODBC \
+ vos \
wizards \
writerfilter \
x11_extensions \
Added: openoffice/trunk/main/twain/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/twain/Makefile?rev=1827953&view=auto
==============================================================================
--- openoffice/trunk/main/twain/Makefile (added)
+++ openoffice/trunk/main/twain/Makefile Thu Mar 29 00:45:19 2018
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
Propchange: openoffice/trunk/main/twain/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/twain/Module_twain.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/twain/Module_twain.mk?rev=1827953&view=auto
==============================================================================
--- openoffice/trunk/main/twain/Module_twain.mk (added)
+++ openoffice/trunk/main/twain/Module_twain.mk Thu Mar 29 00:45:19 2018
@@ -0,0 +1,30 @@
+#**************************************************************
+#
+# 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_Module_Module,twain))
+
+$(eval $(call gb_Module_add_targets,twain,\
+ Package_inc \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/twain/Package_inc.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/twain/Package_inc.mk?rev=1827953&view=auto
==============================================================================
--- openoffice/trunk/main/twain/Package_inc.mk (added)
+++ openoffice/trunk/main/twain/Package_inc.mk Thu Mar 29 00:45:19 2018
@@ -0,0 +1,26 @@
+#**************************************************************
+#
+# 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,twain_inc,$(SRCDIR)/twain))
+
+$(eval $(call
gb_Package_add_file,twain_inc,inc/external/twain/twain.h,inc/twain.h))
Modified: openoffice/trunk/main/twain/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/twain/prj/build.lst?rev=1827953&r1=1827952&r2=1827953&view=diff
==============================================================================
--- openoffice/trunk/main/twain/prj/build.lst (original)
+++ openoffice/trunk/main/twain/prj/build.lst Thu Mar 29 00:45:19 2018
@@ -1,3 +1,2 @@
tw twain : solenv NULL
-tw twain usr1 -
all tw_mkout NULL
-tw twain\util nmake - n tw_util NULL
+tw twain\prj nmake - n tw_prj NULL
Modified: openoffice/trunk/main/twain/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/twain/prj/d.lst?rev=1827953&r1=1827952&r2=1827953&view=diff
==============================================================================
--- openoffice/trunk/main/twain/prj/d.lst (original)
+++ openoffice/trunk/main/twain/prj/d.lst Thu Mar 29 00:45:19 2018
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\twain
-..\%__SRC%\inc\twain.h %_DEST%\inc%_EXT%\external\twain\twain.h
Added: openoffice/trunk/main/twain/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/twain/prj/makefile.mk?rev=1827953&view=auto
==============================================================================
--- openoffice/trunk/main/twain/prj/makefile.mk (added)
+++ openoffice/trunk/main/twain/prj/makefile.mk Thu Mar 29 00:45:19 2018
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
$(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
