[Libreoffice-commits] .: desktop/Executable_crashrep.com.mk desktop/Executable_guistdio.mk desktop/Module_desktop.mk

Jan Holesovsky kendy at kemper.freedesktop.org
Tue Sep 20 07:05:13 PDT 2011


 desktop/Executable_crashrep.com.mk |   53 ++++++++++++++++++++++++++++++++++++
 desktop/Executable_guistdio.mk     |   54 -------------------------------------
 desktop/Module_desktop.mk          |    2 -
 3 files changed, 54 insertions(+), 55 deletions(-)

New commits:
commit d91df661db19e3e4a28e1875edec832c832a62e4
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Sep 20 16:02:27 2011 +0200

    Rename guistdio to crashrep.com.

diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
new file mode 100644
index 0000000..5d01173
--- /dev/null
+++ b/desktop/Executable_crashrep.com.mk
@@ -0,0 +1,53 @@
+# 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,crashrep.com))
+
+$(eval $(call gb_Executable_set_targettype_gui,crashrep.com,NO))
+
+$(eval $(call gb_Executable_add_precompiled_header,crashrep.com,desktop/inc/pch/precompiled_desktop.hxx))
+
+$(eval $(call gb_Executable_set_include,crashrep.com,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_defs,crashrep.com,\
+    $(LFS_CFLAGS) \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,crashrep.com,\
+    user32 \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,crashrep.com,\
+    desktop/win32/source/guistdio/guistdio \
+))
+
+# the resulting executable is called soffice.bin.exe, copy it to soffice.bin
+$(eval $(call gb_Package_Package,crashrep.com,$(OUTDIR)/bin))
+$(eval $(call gb_Package_add_file,crashrep.com,bin/crashrep.com,crashrep.com.exe))
+
+# vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_guistdio.mk b/desktop/Executable_guistdio.mk
deleted file mode 100644
index 6da11cf..0000000
--- a/desktop/Executable_guistdio.mk
+++ /dev/null
@@ -1,54 +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,guistdio))
-
-$(eval $(call gb_Executable_set_targettype_gui,guistdio,NO))
-
-$(eval $(call gb_Executable_add_precompiled_header,guistdio,desktop/inc/pch/precompiled_desktop.hxx))
-
-$(eval $(call gb_Executable_set_include,guistdio,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/desktop/inc/pch \
-))
-
-$(eval $(call gb_Executable_add_defs,guistdio,\
-    $(LFS_CFLAGS) \
-))
-
-ifeq ($(OS),WNT)
-
-$(eval $(call gb_Executable_add_linked_libs,guistdio,\
-    user32 \
-))
-
-endif
-
-
-$(eval $(call gb_Executable_add_exception_objects,guistdio,\
-    desktop/win32/source/guistdio/guistdio \
-))
-
-# vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index ad0165c..0e7da8e 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -66,7 +66,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
 ifeq ($(OS),WNT)
 
 $(eval $(call gb_Module_add_targets,desktop,\
-    Executable_guistdio \
+    Executable_crashrep.com \
     Executable_loader2 \
     Executable_quickstart \
     Executable_sbase \


More information about the Libreoffice-commits mailing list