[Libreoffice-commits] .: 2 commits - desktop/Executable_unopkg.bin.mk desktop/Executable_unopkg.com.mk desktop/Executable_unopkgio.mk desktop/Executable_unopkg.mk desktop/Module_desktop.mk
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Sep 20 05:59:31 PDT 2011
desktop/Executable_unopkg.bin.mk | 8 ++++++
desktop/Executable_unopkg.com.mk | 49 +++++++++++++++++++++++++++++++++++++++
desktop/Executable_unopkg.mk | 49 ---------------------------------------
desktop/Executable_unopkgio.mk | 45 -----------------------------------
desktop/Module_desktop.mk | 8 +-----
5 files changed, 59 insertions(+), 100 deletions(-)
New commits:
commit 151eba7caa58c52ca4c4f2542de91c9aa41d00ab
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Sep 20 14:59:00 2011 +0200
Create unopkg.com directly.
diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg.com.mk
new file mode 100644
index 0000000..3eb3ecd
--- /dev/null
+++ b/desktop/Executable_unopkg.com.mk
@@ -0,0 +1,49 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,unopkg.com))
+
+$(eval $(call gb_Executable_set_targettype_gui,unopkg.com,NO))
+
+$(eval $(call gb_Executable_add_precompiled_header,unopkg.com,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,unopkg.com,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_defs,unopkg.com,\
+ $(LFS_CFLAGS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,unopkg.com,\
+ desktop/win32/source/guistdio/unopkgio \
+))
+
+# the resulting executable is called unopkg.com.exe, copy it to unopkg.com
+$(eval $(call gb_Package_Package,unopkg.com,$(OUTDIR)/bin))
+$(eval $(call gb_Package_add_file,unopkg.com,bin/unopkg.com,unopkg.com.exe))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_unopkgio.mk b/desktop/Executable_unopkgio.mk
deleted file mode 100644
index c0c3284..0000000
--- a/desktop/Executable_unopkgio.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Executable_Executable,unopkgio))
-
-$(eval $(call gb_Executable_set_targettype_gui,unopkgio,NO))
-
-$(eval $(call gb_Executable_add_precompiled_header,unopkgio,desktop/inc/pch/precompiled_desktop.hxx))
-
-$(eval $(call gb_Executable_set_include,unopkgio,\
- $$(INCLUDE) \
- -I$(SRCDIR)/desktop/inc/pch \
-))
-
-$(eval $(call gb_Executable_add_defs,unopkgio,\
- $(LFS_CFLAGS) \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,unopkgio,\
- desktop/win32/source/guistdio/unopkgio \
-))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 94035b5..5c7a5a4 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -79,7 +79,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
Executable_sweb \
Executable_swriter \
Executable_unoinfo \
- Executable_unopkgio \
+ Executable_unopkg.com \
Package_manifest \
Package_rcfile \
WinResTarget_quickstart \
commit 80f2495481542528fb4ceb24e4184e39ec1b6d40
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Sep 20 14:53:21 2011 +0200
Create unopkg.bin directly.
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index e472b1d..46876ec 100644
--- a/desktop/Executable_unopkg.bin.mk
+++ b/desktop/Executable_unopkg.bin.mk
@@ -46,4 +46,12 @@ $(eval $(call gb_Executable_add_cobjects,unopkg.bin,\
desktop/source/pkgchk/unopkg/unopkg_main \
))
+ifeq ($(OS),WNT)
+
+# the resulting executable is called unopkg.bin.exe, copy it to unopkg.bin
+$(eval $(call gb_Package_Package,unopkg.bin,$(OUTDIR)/bin))
+$(eval $(call gb_Package_add_file,unopkg.bin,bin/unopkg.bin,unopkg.bin.exe))
+
+endif
+
# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk
deleted file mode 100644
index 3dffb08..0000000
--- a/desktop/Executable_unopkg.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are licable
-# instead of those above.
-
-$(eval $(call gb_Executable_Executable,unopkg))
-
-$(eval $(call gb_Executable_set_targettype_gui,unopkg,YES))
-
-$(eval $(call gb_Executable_add_precompiled_header,unopkg,desktop/inc/pch/precompiled_desktop.hxx))
-
-$(eval $(call gb_Executable_set_include,unopkg,\
- $$(INCLUDE) \
- -I$(SRCDIR)/desktop/inc/pch \
- -I$(SRCDIR)/desktop/source/inc \
-))
-
-$(eval $(call gb_Executable_add_linked_libs,unopkg,\
- comphelper \
- sal \
- tl \
- unopkgapp \
-))
-
-$(eval $(call gb_Executable_add_cobjects,unopkg,\
- desktop/source/pkgchk/unopkg/unopkg_main \
-))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 36e41fe..94035b5 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
AllLangResTarget_deploymentgui \
AllLangResTarget_dkt \
Executable_soffice.bin \
+ Executable_unopkg.bin \
Library_deployment \
Library_deploymentgui \
Library_deploymentmisc \
@@ -78,7 +79,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
Executable_sweb \
Executable_swriter \
Executable_unoinfo \
- Executable_unopkg \
Executable_unopkgio \
Package_manifest \
Package_rcfile \
@@ -95,10 +95,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
else
-$(eval $(call gb_Module_add_targets,desktop,\
- Executable_unopkg.bin \
-))
-
ifeq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,desktop,\
More information about the Libreoffice-commits
mailing list