Module_ooo.mk | 1
apple_remote/Library_AppleRemote.mk | 56 ++++++++++++++++++++++++++
apple_remote/Makefile | 32 +++++++++++++++
apple_remote/Module_apple_remote.mk | 33 +++++++++++++++
apple_remote/Package_inc.mk | 33 +++++++++++++++
apple_remote/makefile.mk | 76 ------------------------------------
apple_remote/prj/build.lst | 2
apple_remote/prj/d.lst | 5 --
apple_remote/prj/makefile.mk | 44 ++++++++++++++++++++
9 files changed, 200 insertions(+), 82 deletions(-)
New commits:
commit 1e83a495f196e604418c4300817f66bc9bd7f2c1
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Fri Feb 15 13:09:06 2019 +0000
Commit: Damjan Jovanovic <dam...@apache.org>
CommitDate: Fri Feb 15 13:09:06 2019 +0000
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
diff --git a/Module_ooo.mk b/Module_ooo.mk
index 00a1125ab419..6adeea125a71 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
UnoControls \
accessibility \
animations \
+ apple_remote \
autodoc \
automation \
avmedia \
diff --git a/apple_remote/Library_AppleRemote.mk
b/apple_remote/Library_AppleRemote.mk
new file mode 100644
index 000000000000..8c7aedd2679e
--- /dev/null
+++ b/apple_remote/Library_AppleRemote.mk
@@ -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:
+
diff --git a/apple_remote/Makefile b/apple_remote/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/apple_remote/Makefile
@@ -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:
diff --git a/apple_remote/Module_apple_remote.mk
b/apple_remote/Module_apple_remote.mk
new file mode 100644
index 000000000000..415a1f156ab6
--- /dev/null
+++ b/apple_remote/Module_apple_remote.mk
@@ -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:
diff --git a/apple_remote/Package_inc.mk b/apple_remote/Package_inc.mk
new file mode 100644
index 000000000000..994dac576495
--- /dev/null
+++ b/apple_remote/Package_inc.mk
@@ -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))
diff --git a/apple_remote/makefile.mk b/apple_remote/makefile.mk
deleted file mode 100644
index e1edf7142961..000000000000
--- a/apple_remote/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#**************************************************************
-#
-# 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=.
-
-PRJNAME=external
-TARGET=AppleRemote
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="aqua"
-
-dummy:
- @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE # "$(GUIBASE)"!="aqua"
-
-SHL1STDLIBS+= \
- -framework Cocoa -framework Carbon -framework IOKit
-
-LIB1FILES+= \
- $(SLB)$/AppleRemote.lib
-
-SLOFILES= \
- $(SLO)$/AppleRemote.obj \
- $(SLO)$/RemoteControl.obj \
- $(SLO)$/RemoteControlContainer.obj \
- $(SLO)$/GlobalKeyboardDevice.obj \
- $(SLO)$/HIDRemoteControlDevice.obj \
- $(SLO)$/MultiClickRemoteBehavior.obj \
- $(SLO)$/RemoteMainController.obj
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1OBJS= $(SLOFILES)
-
-OUT2INC = \
- $(BUILDDIR)$/AppleRemote.h \
- $(BUILDDIR)$/RemoteControl.h \
- $(BUILDDIR)$/RemoteControlContainer.h \
- $(BUILDDIR)$/GlobalKeyboardDevice.h \
- $(BUILDDIR)$/HIDRemoteControlDevice.h \
- $(BUILDDIR)$/MultiClickRemoteBehavior.h \
- $(BUILDDIR)$/RemoteMainController.h
-
-
-.ENDIF # "$(GUIBASE)"!="aqua"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/apple_remote/prj/build.lst b/apple_remote/prj/build.lst
index ff4ee577408a..184d9a2b5eee 100644
--- a/apple_remote/prj/build.lst
+++ b/apple_remote/prj/build.lst
@@ -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
diff --git a/apple_remote/prj/d.lst b/apple_remote/prj/d.lst
index ef6dd4613f43..e69de29bb2d1 100644
--- a/apple_remote/prj/d.lst
+++ b/apple_remote/prj/d.lst
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\apple_remote
-..\inc\*.h %_DEST%\inc%_EXT%\apple_remote\*
-
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
diff --git a/apple_remote/prj/makefile.mk b/apple_remote/prj/makefile.mk
new file mode 100644
index 000000000000..c62c6a657d16
--- /dev/null
+++ b/apple_remote/prj/makefile.mk
@@ -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
diff --git a/apple_remote/AppleRemote.m b/apple_remote/source/AppleRemote.m
similarity index 100%
rename from apple_remote/AppleRemote.m
rename to apple_remote/source/AppleRemote.m
diff --git a/apple_remote/GlobalKeyboardDevice.m
b/apple_remote/source/GlobalKeyboardDevice.m
similarity index 100%
rename from apple_remote/GlobalKeyboardDevice.m
rename to apple_remote/source/GlobalKeyboardDevice.m
diff --git a/apple_remote/HIDRemoteControlDevice.m
b/apple_remote/source/HIDRemoteControlDevice.m
similarity index 100%
rename from apple_remote/HIDRemoteControlDevice.m
rename to apple_remote/source/HIDRemoteControlDevice.m
diff --git a/apple_remote/KeyspanFrontRowControl.m
b/apple_remote/source/KeyspanFrontRowControl.m
similarity index 100%
rename from apple_remote/KeyspanFrontRowControl.m
rename to apple_remote/source/KeyspanFrontRowControl.m
diff --git a/apple_remote/MultiClickRemoteBehavior.m
b/apple_remote/source/MultiClickRemoteBehavior.m
similarity index 100%
rename from apple_remote/MultiClickRemoteBehavior.m
rename to apple_remote/source/MultiClickRemoteBehavior.m
diff --git a/apple_remote/RemoteControl.m b/apple_remote/source/RemoteControl.m
similarity index 100%
rename from apple_remote/RemoteControl.m
rename to apple_remote/source/RemoteControl.m
diff --git a/apple_remote/RemoteControlContainer.m
b/apple_remote/source/RemoteControlContainer.m
similarity index 100%
rename from apple_remote/RemoteControlContainer.m
rename to apple_remote/source/RemoteControlContainer.m
diff --git a/apple_remote/RemoteMainController.m
b/apple_remote/source/RemoteMainController.m
old mode 100755
new mode 100644
similarity index 100%
rename from apple_remote/RemoteMainController.m
rename to apple_remote/source/RemoteMainController.m
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
