On Feb 15, 2019, at 8:09 AM, dam...@apache.org wrote:
Author: damjan
Date: Fri Feb 15 13:09:06 2019
New Revision: 1853643
URL: http://svn.apache.org/viewvc?rev=1853643&view=rev
Log:
Port main/apple_remote to gbuild.
Not tested, since we don't have a Mac buildbot, and I don't have a Mac.
Patch by: me
Added:
openoffice/trunk/main/apple_remote/Library_AppleRemote.mk
openoffice/trunk/main/apple_remote/Makefile (with props)
openoffice/trunk/main/apple_remote/Module_apple_remote.mk
openoffice/trunk/main/apple_remote/Package_inc.mk
openoffice/trunk/main/apple_remote/prj/makefile.mk
openoffice/trunk/main/apple_remote/source/
openoffice/trunk/main/apple_remote/source/AppleRemote.m
- copied unchanged from r1853642,
openoffice/trunk/main/apple_remote/AppleRemote.m
openoffice/trunk/main/apple_remote/source/GlobalKeyboardDevice.m
- copied unchanged from r1853642,
openoffice/trunk/main/apple_remote/GlobalKeyboardDevice.m
openoffice/trunk/main/apple_remote/source/HIDRemoteControlDevice.m
- copied unchanged from r1853642,
openoffice/trunk/main/apple_remote/HIDRemoteControlDevice.m
openoffice/trunk/main/apple_remote/source/KeyspanFrontRowControl.m
- copied unchanged from r1853642,
openoffice/trunk/main/apple_remote/KeyspanFrontRowControl.m
openoffice/trunk/main/apple_remote/source/MultiClickRemoteBehavior.m
- copied unchanged from r1853642,
openoffice/trunk/main/apple_remote/MultiClickRemoteBehavior.m
openoffice/trunk/main/apple_remote/source/RemoteControl.m
- copied unchanged from r1853642,
openoffice/trunk/main/apple_remote/RemoteControl.m
openoffice/trunk/main/apple_remote/source/RemoteControlContainer.m
- copied unchanged from r1853642,
openoffice/trunk/main/apple_remote/RemoteControlContainer.m
openoffice/trunk/main/apple_remote/source/RemoteMainController.m
- copied unchanged from r1853642,
openoffice/trunk/main/apple_remote/RemoteMainController.m
Removed:
openoffice/trunk/main/apple_remote/AppleRemote.m
openoffice/trunk/main/apple_remote/GlobalKeyboardDevice.m
openoffice/trunk/main/apple_remote/HIDRemoteControlDevice.m
openoffice/trunk/main/apple_remote/KeyspanFrontRowControl.m
openoffice/trunk/main/apple_remote/MultiClickRemoteBehavior.m
openoffice/trunk/main/apple_remote/RemoteControl.m
openoffice/trunk/main/apple_remote/RemoteControlContainer.m
openoffice/trunk/main/apple_remote/RemoteMainController.m
openoffice/trunk/main/apple_remote/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/apple_remote/prj/build.lst
openoffice/trunk/main/apple_remote/prj/d.lst
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1853643&r1=1853642&r2=1853643&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Fri Feb 15 13:09:06 2019
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,o
UnoControls \
accessibility \
animations \
+ apple_remote \
autodoc \
automation \
avmedia \
Added: openoffice/trunk/main/apple_remote/Library_AppleRemote.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/apple_remote/Library_AppleRemote.mk?rev=1853643&view=auto
==============================================================================
--- openoffice/trunk/main/apple_remote/Library_AppleRemote.mk (added)
+++ openoffice/trunk/main/apple_remote/Library_AppleRemote.mk Fri Feb 15
13:09:06 2019
@@ -0,0 +1,56 @@
+#**************************************************************
+#
+# 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_Library_Library,AppleRemote))
+
+$(eval $(call gb_Library_add_package_headers,AppleRemote,apple_remote_inc))
+
+$(eval $(call gb_Library_set_include,AppleRemote,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/apple_remote/inc \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,AppleRemote,\
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,AppleRemote,\
+ -framework Cocoa \
+ -framework Carbon \
+ -framework IOKit \
+))
+
+$(eval $(call gb_Library_add_objcxxobjects,AppleRemote,\
+ apple_remote/source/AppleRemote \
+ apple_remote/source/RemoteControl \
+ apple_remote/source/RemoteControlContainer \
+ apple_remote/source/GlobalKeyboardDevice \
+ apple_remote/source/HIDRemoteControlDevice \
+ apple_remote/source/MultiClickRemoteBehavior \
+ apple_remote/source/RemoteMainController \
+))
+
+# vim: set noet sw=4 ts=4:
+
Added: openoffice/trunk/main/apple_remote/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/apple_remote/Makefile?rev=1853643&view=auto
==============================================================================
--- openoffice/trunk/main/apple_remote/Makefile (added)
+++ openoffice/trunk/main/apple_remote/Makefile Fri Feb 15 13:09:06 2019
@@ -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/apple_remote/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/apple_remote/Module_apple_remote.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/apple_remote/Module_apple_remote.mk?rev=1853643&view=auto
==============================================================================
--- openoffice/trunk/main/apple_remote/Module_apple_remote.mk (added)
+++ openoffice/trunk/main/apple_remote/Module_apple_remote.mk Fri Feb 15
13:09:06 2019
@@ -0,0 +1,33 @@
+#**************************************************************
+#
+# 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,apple_remote))
+
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Module_add_targets,apple_remote,\
+ Library_AppleRemote \
+ Package_inc \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/apple_remote/Package_inc.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/apple_remote/Package_inc.mk?rev=1853643&view=auto
==============================================================================
--- openoffice/trunk/main/apple_remote/Package_inc.mk (added)
+++ openoffice/trunk/main/apple_remote/Package_inc.mk Fri Feb 15 13:09:06 2019
@@ -0,0 +1,33 @@
+#**************************************************************
+#
+# 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,apple_remote_inc,$(SRCDIR)/apple_remote/inc))
+
+$(eval $(call
gb_Package_add_file,apple_remote_inc,inc/apple_remote/AppleRemote.h,AppleRemote.h))
+$(eval $(call
gb_Package_add_file,apple_remote_inc,inc/apple_remote/GlobalKeyboardDevice.h,GlobalKeyboardDevice.h))
+$(eval $(call
gb_Package_add_file,apple_remote_inc,inc/apple_remote/HIDRemoteControlDevice.h,HIDRemoteControlDevice.h))
+$(eval $(call
gb_Package_add_file,apple_remote_inc,inc/apple_remote/KeyspanFrontRowControl.h,KeyspanFrontRowControl.h))
+$(eval $(call
gb_Package_add_file,apple_remote_inc,inc/apple_remote/MultiClickRemoteBehavior.h,MultiClickRemoteBehavior.h))
+$(eval $(call
gb_Package_add_file,apple_remote_inc,inc/apple_remote/RemoteControl.h,RemoteControl.h))
+$(eval $(call
gb_Package_add_file,apple_remote_inc,inc/apple_remote/RemoteControlContainer.h,RemoteControlContainer.h))
+$(eval $(call
gb_Package_add_file,apple_remote_inc,inc/apple_remote/RemoteMainController.h,RemoteMainController.h))
Modified: openoffice/trunk/main/apple_remote/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/apple_remote/prj/build.lst?rev=1853643&r1=1853642&r2=1853643&view=diff
==============================================================================
--- openoffice/trunk/main/apple_remote/prj/build.lst (original)
+++ openoffice/trunk/main/apple_remote/prj/build.lst Fri Feb 15 13:09:06 2019
@@ -1,2 +1,2 @@
apr apple_remote : solenv soltools NULL
-apr apple_remote nmake - u apr_aprem NULL
+apr apple_remote\prj nmake - u apr_prj NULL
Modified: openoffice/trunk/main/apple_remote/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/apple_remote/prj/d.lst?rev=1853643&r1=1853642&r2=1853643&view=diff
==============================================================================
--- openoffice/trunk/main/apple_remote/prj/d.lst (original)
+++ openoffice/trunk/main/apple_remote/prj/d.lst Fri Feb 15 13:09:06 2019
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\apple_remote
-..\inc\*.h %_DEST%\inc%_EXT%\apple_remote\*
-
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
Added: openoffice/trunk/main/apple_remote/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/apple_remote/prj/makefile.mk?rev=1853643&view=auto
==============================================================================
--- openoffice/trunk/main/apple_remote/prj/makefile.mk (added)
+++ openoffice/trunk/main/apple_remote/prj/makefile.mk Fri Feb 15 13:09:06 2019
@@ -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
