Makefile.top | 4 -
Module_tail_build.mk | 3
Repository.mk | 1
cross_toolset/prj/build.lst | 2
l10ntools/Executable_idxdict.mk | 34 ++++++++++
l10ntools/Module_l10ntools.mk | 1
l10ntools/source/idxdict/idxdict.cxx | 104 ++++++++++++++++++++++++++++++++
solenv/CustomTarget_gdb.mk | 40 ++++++++++++
solenv/CustomTarget_versionlist.mk | 45 +++++++++++++
solenv/Makefile | 7 ++
solenv/Module_solenv.mk | 42 ++++++++++++
solenv/Package_gdb.mk | 40 ++++++++++++
solenv/Package_inc.mk | 32 +++++++++
solenv/gbuild/Package.mk | 26 ++++++++
solenv/gdb/makefile.mk | 40 ------------
solenv/makefile.mk | 42 ------------
solenv/prj/build.lst | 2
solenv/prj/d.lst | 5 -
tail_build/prj/build.lst | 2
vcl/Library_vclplug_gen.mk | 6 +
x11_extensions/Makefile | 7 ++
x11_extensions/Module_x11_extensions.mk | 34 ++++++++++
x11_extensions/Package_inc.mk | 39 ++++++++++++
x11_extensions/prj/d.lst | 5 -
24 files changed, 465 insertions(+), 98 deletions(-)
New commits:
commit c0a4b0967bb7fffd1d8489fe8b04942b2f061a8c
Author: David Tardon <dtar...@redhat.com>
Date: Sun May 20 16:25:00 2012 +0200
we do not need to depend on dictionaries anymore
Change-Id: I78e0772723ca3bc6c2fef42d6af66e17117cac0b
diff --git a/cross_toolset/prj/build.lst b/cross_toolset/prj/build.lst
index 464000d..e1c1510 100644
--- a/cross_toolset/prj/build.lst
+++ b/cross_toolset/prj/build.lst
@@ -1 +1 @@
-crs cross_toolset :: autodoc cross_tail_build setup_native icc shell
DICTIONARIES:dictionaries NULL
+crs cross_toolset :: autodoc cross_tail_build setup_native icc shell
NULL
commit 217b573354479c1c42f840d1a011bc434bb2c498
Author: David Tardon <dtar...@redhat.com>
Date: Sun May 20 16:19:26 2012 +0200
move idxdict out of dictionaries
So dictionaries is again a nice data-only module and we do not need to
build it in build phase of cross-compilation. It really does not make
sense to build a gazillion of extensions just because we will need one
tiny tool later...
Change-Id: I23f01b818afba1bc8cc88ef3e8305ecfb7a193c0
diff --git a/Repository.mk b/Repository.mk
index 44b4f17..535b0e1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
genindex_data \
gsicheck \
helpex \
+ idxdict \
localize \
mkunroll \
osl_process_child \
diff --git a/l10ntools/Executable_idxdict.mk b/l10ntools/Executable_idxdict.mk
new file mode 100644
index 0000000..2521b93
--- /dev/null
+++ b/l10ntools/Executable_idxdict.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# 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) 2012 Red Hat, Inc., David Tardon <dtar...@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,idxdict))
+
+$(eval $(call gb_Executable_add_exception_objects,idxdict,\
+ l10ntools/source/idxdict/idxdict \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk
index 35327a9..c149db0 100644
--- a/l10ntools/Module_l10ntools.mk
+++ b/l10ntools/Module_l10ntools.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_Module,l10ntools))
$(eval $(call gb_Module_add_targets,l10ntools,\
Executable_helpex \
+ Executable_idxdict \
Executable_ulfex \
Executable_gsicheck \
Executable_cfgex \
diff --git a/l10ntools/source/idxdict/idxdict.cxx
b/l10ntools/source/idxdict/idxdict.cxx
new file mode 100644
index 0000000..9b0cbc2
--- /dev/null
+++ b/l10ntools/source/idxdict/idxdict.cxx
@@ -0,0 +1,104 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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.
+ *
+ * The Initial Developer of the Original Code is
+ * Steven Butler <sebut...@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * 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.
+ */
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <map>
+#include <stdlib.h>
+#include <string.h>
+
+static const int MAXLINE = 1024*64;
+
+using namespace std;
+
+int main(int argc, char *argv[])
+{
+ if (argc != 3 || strcmp(argv[1],"-o"))
+ {
+ cout << "Usage: idxdict -o outputfile < input\n";
+ ::exit(99);
+ }
+ // This call improves performance by approx 5x
+ cin.sync_with_stdio(false);
+
+ const char * outputFile(argv[2]);
+ char inputBuffer[MAXLINE];
+ multimap<string, size_t> entries;
+ multimap<string,size_t>::iterator ret(entries.begin());
+
+ int line(1);
+ cin.getline(inputBuffer, MAXLINE);
+ const string encoding(inputBuffer);
+ size_t currentOffset(encoding.size()+1);
+ while (true)
+ {
+ // Extract the next word, but not the entry count
+ cin.getline(inputBuffer, MAXLINE, '|');
+
+ if (cin.eof()) break;
+
+ string word(inputBuffer);
+ ret = entries.insert(ret, pair<string, size_t>(word,
currentOffset));
+ currentOffset += word.size() + 1;
+ // Next is the entry count
+ cin.getline(inputBuffer, MAXLINE);
+ if (!cin.good())
+ {
+ cerr << "Unable to read entry - insufficient
buffer?.\n";
+ exit(99);
+ }
+ currentOffset += strlen(inputBuffer)+1;
+ int entryCount(strtol(inputBuffer, NULL, 10));
+ for (int i(0); i < entryCount; ++i)
+ {
+ cin.getline(inputBuffer, MAXLINE);
+ currentOffset += strlen(inputBuffer)+1;
+ ++line;
+ }
+ }
+
+ // Use binary mode to prevent any translation of LF to CRLF on Windows
+ ofstream outputStream(outputFile, ios_base::binary|
ios_base::trunc|ios_base::out);
+ if (!outputStream.is_open())
+ {
+ cerr << "Unable to open output file " << outputFile << endl;
+ ::exit(99);
+ }
+
+ outputStream << encoding << '\n' << entries.size() << '\n';
+
+ for (multimap<string, size_t>::const_iterator ii(entries.begin());
+ ii != entries.end();
+ ++ii
+ )
+ {
+ outputStream << ii->first << '|' << ii->second << '\n';
+ }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3591aff5850e52f163f8bbf6b0bd47cd647de46d
Author: David Tardon <dtar...@redhat.com>
Date: Sun May 20 12:57:54 2012 +0200
gbuildize solenv
Change-Id: I6e0758e543a89f593a1b0432b28b4c9768993af7
diff --git a/Makefile.top b/Makefile.top
index bee84e2..1396514 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -110,6 +110,7 @@ sdext\
sfx2\
slideshow\
smoketest\
+solenv\
sot\
starmath\
stoc\
@@ -230,7 +231,6 @@ saxon\
scp2\
setup_native\
shell\
-solenv\
soltools\
stax\
stlport\
diff --git a/solenv/CustomTarget_gdb.mk b/solenv/CustomTarget_gdb.mk
new file mode 100644
index 0000000..0be8cdf
--- /dev/null
+++ b/solenv/CustomTarget_gdb.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# 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) 2012 Red Hat, Inc., David Tardon <dtar...@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_CustomTarget_CustomTarget,solenv/gdb))
+
+$(call gb_CustomTarget_get_target,solenv/gdb) : \
+ $(SRCDIR)/solenv/bin/install-gdb-printers \
+ $(SRCDIR)/solenv/gdb/autoload.template \
+ | $(call gb_CustomTarget_get_workdir,solenv/gdb)/.dir
+
+$(call gb_CustomTarget_get_target,solenv/gdb) :
+ $(call gb_Output_announce,solenv/gdb,$(true),SH ,1)
+ install-gdb-printers -a $(call gb_CustomTarget_get_workdir,solenv/gdb)
-f && \
+ touch $@
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/CustomTarget_versionlist.mk
b/solenv/CustomTarget_versionlist.mk
new file mode 100644
index 0000000..f7706ac
--- /dev/null
+++ b/solenv/CustomTarget_versionlist.mk
@@ -0,0 +1,45 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# 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) 2012 Red Hat, Inc., David Tardon <dtar...@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_CustomTarget_CustomTarget,solenv/versionlist))
+
+include $(SRCDIR)/solenv/inc/minor.mk
+
+$(call gb_CustomTarget_get_target,solenv/versionlist) : $(call
gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc
+
+$(call gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc : \
+ $(SRCDIR)/solenv/inc/minor.mk \
+ | $(call gb_CustomTarget_get_workdir,solenv/versionlist)/.dir
+
+$(call gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc :
+ $(call gb_Output_announce,solenv/versionlist,$(true),ECH,1)
+ echo '#define VERSION $(VERSIONMAJOR)' > $@ && \
+ echo '#define SUBVERSION $(VERSIONMINOR)' >> $@ && \
+ echo '#define MICROVERSION $(VERSIONMICRO)' >> $@ && \
+ echo '#define VER_YEARRANGE $(COPYRIGHTYEARRANGE)' >> $@
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/Makefile b/solenv/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/solenv/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
new file mode 100644
index 0000000..136d78b
--- /dev/null
+++ b/solenv/Module_solenv.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# 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) 2012 Red Hat, Inc., David Tardon <dtar...@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_Module_Module,solenv))
+
+$(eval $(call gb_Module_add_targets,solenv,\
+ CustomTarget_versionlist \
+ Package_inc \
+))
+
+ifeq ($(GUI),UNX)
+$(eval $(call gb_Module_add_targets,solenv,\
+ CustomTarget_gdb \
+ Package_gdb \
+))
+endif
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/Package_gdb.mk b/solenv/Package_gdb.mk
new file mode 100644
index 0000000..a516a08
--- /dev/null
+++ b/solenv/Package_gdb.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# 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) 2012 Red Hat, Inc., David Tardon <dtar...@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_Package_Package,solenv_gdb,$(call
gb_CustomTarget_get_workdir,solenv/gdb)))
+
+$(eval $(call gb_Package_add_files,solenv_gdb,lib,\
+ $(call gb_Library_get_runtime_filename,cppu).3-gdb.py \
+ $(call gb_Library_get_runtime_filename,sal).3-gdb.py \
+ $(call gb_Library_get_runtime_filename,svl)-gdb.py \
+ $(call gb_Library_get_runtime_filename,sw)-gdb.py \
+ $(call gb_Library_get_runtime_filename,tl)-gdb.py \
+))
+
+$(call gb_Package_get_preparation_target,solenv_gdb) : $(call
gb_CustomTarget_get_target,solenv/gdb)
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/Package_inc.mk b/solenv/Package_inc.mk
new file mode 100644
index 0000000..00a6f56
--- /dev/null
+++ b/solenv/Package_inc.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# 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) 2012 Red Hat, Inc., David Tardon <dtar...@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_Package_Package,solenv_inc,$(call
gb_CustomTarget_get_workdir,solenv/versionlist)))
+
+$(eval $(call
gb_Package_add_file,solenv_inc,inc/versionlist.hrc,versionlist.hrc))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/gdb/makefile.mk b/solenv/gdb/makefile.mk
deleted file mode 100644
index 0c8df24..0000000
--- a/solenv/gdb/makefile.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# 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) 2010 Red Hat, Inc., David Tardon <dtar...@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.
-
-PRJ=..
-PRJNAME=solenv
-TARGET=gdb
-
-.INCLUDE : settings.mk
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/autoloaders.flag
-
-$(MISC)/autoloaders.flag : autoload.template
- install-gdb-printers -a $(MISC) -f && touch $@
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/makefile.mk b/solenv/makefile.mk
deleted file mode 100644
index 4d80605..0000000
--- a/solenv/makefile.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-PRJNAME=solenv
-TARGET=init
-
-# --- Settings ----------------------------------
-.INCLUDE : settings.mk
-.INCLUDE : target.mk
-
-ALLTAR : $(INCCOM)/versionlist.hrc
-
-$(INCCOM)/versionlist.hrc : ./inc/minor.mk
- $(COMMAND_ECHO)echo "#define VERSION $(VERSIONMAJOR)" > $@
- $(COMMAND_ECHO)echo "#define SUBVERSION $(VERSIONMINOR)" >> $@
- $(COMMAND_ECHO)echo "#define MICROVERSION $(VERSIONMICRO)" >> $@
- $(COMMAND_ECHO)echo "#define VER_YEARRANGE $(COPYRIGHTYEARRANGE)" >> $@
diff --git a/solenv/prj/build.lst b/solenv/prj/build.lst
index 8f3f9b0..91d08d9 100644
--- a/solenv/prj/build.lst
+++ b/solenv/prj/build.lst
@@ -1,4 +1,2 @@
sn solenv : NULL
sn solenv
usr1 - all sn_mkout NULL
-sn solenv
nmake - all sn_init NULL
-sn solenv\gdb
nmake - all sn_gdb sn_init NULL
diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst
index 14b66d1..e69de29 100644
--- a/solenv/prj/d.lst
+++ b/solenv/prj/d.lst
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\bin
-mkdir: %_DEST%\inc
-mkdir: %_DEST%\lib
-..\%__SRC%\inc\versionlist.hrc %_DEST%\inc\versionlist.hrc
-..\%__SRC%\misc\*-gdb.py %_DEST%\lib\*-gdb.py
diff --git a/solenv/prj/dmake b/solenv/prj/dmake
deleted file mode 100644
index e69de29..0000000
commit 96735db3246956d22f34976b8b461dbab79a13e8
Author: David Tardon <dtar...@redhat.com>
Date: Sun May 20 13:06:37 2012 +0200
make adding a bunch of files a bit easier
Change-Id: I97e6d26a33e18f0303742c930478a8ebac13a7b0
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 62d82bd..02d447c 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -83,4 +83,30 @@ $(call
gb_PackagePart_PackagePart,$(2),$$(gb_Package_SOURCEDIR_$(1))/$(3),$(call
endef
+# Adds several files at once.
+#
+# Files are copied directly into the specified directory.
+#
+# Example:
+# $(eval $(call gb_Package_Package,foo_inc,$(SRCDIR)/foo/inc))
+# $(eval $(call gb_Package_add_files,foo_inc,inc/foo,foo/bar/foo.hxx))
+# # -> inc/foo/foo.hxx
+define gb_Package_add_files
+$(foreach file,$(3),$(call gb_Package_add_file,$(1),$(2)/$(notdir
$(file)),$(file)))
+
+endef
+
+# Adds several files at once.
+#
+# Files are copied including subdirectories.
+#
+# Example:
+# $(eval $(call gb_Package_Package,foo_inc,$(SRCDIR)/foo/inc))
+# $(eval $(call gb_Package_add_files,foo_inc,inc,foo/bar/foo.hxx))
+# # -> inc/foo/bar/foo.hxx
+define gb_Package_add_files_with_dir
+$(foreach file,$(3),$(call gb_Package_add_file,$(1),$(2)/$(file),$(file)))
+
+endef
+
# vim: set noet sw=4:
commit 220dcadca1dad5e5b872371c5a4110e244d4e944
Author: David Tardon <dtar...@redhat.com>
Date: Sun May 20 12:04:29 2012 +0200
move x11_extensions to tail_build
Change-Id: I7ed368730ddba2dac28e05970c509081ecaf0e80
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 56ad548..b37a45d 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -92,6 +92,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
wizards \
writerfilter \
writerperfect \
+ $(if $(filter X11_EXTENSIONS,$(BUILD_TYPE)), \
+ x11_extensions \
+ ) \
xmerge \
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
xmlhelp) \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index bb50d8b..b3afe4f 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo DESKTOP:codemaker CURL:curl
FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell
HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr
LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec
LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio
LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl
PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations
TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib
basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper
cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi
officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo
RHINO:rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl
sysui tools uc
bhelper udkapi unoil unotest unotools ure xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo DESKTOP:codemaker CURL:curl
FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell
HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr
LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec
LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio
LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl
PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations
TWAIN:twain VIGRA:vigra XPDF:xpdf ZLIB:zlib basegfx bridges comphelper
DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc
javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo
DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar rsc sal salhelper sax shell
solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil unotest u
notools ure xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 3ff257a..50c0c64 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -28,6 +28,12 @@
$(eval $(call gb_Library_Library,vclplug_gen))
+ifneq ($(filter X11_EXTENSIONS,$(BUILD_TYPE)),)
+$(eval $(call gb_Library_use_packages,vclplug_gen,\
+ x11_extensions_inc \
+))
+endif
+
$(eval $(call gb_Library_set_include,vclplug_gen,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
commit 07ab493b5242db050db75bb93d28696b74e588c3
Author: David Tardon <dtar...@redhat.com>
Date: Sun May 20 11:56:58 2012 +0200
gbuildize x11_extensions
Change-Id: I4362106ac5d221241eafdf44705ca5553ac7013c
diff --git a/Makefile.top b/Makefile.top
index 70bfe7a..bee84e2 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -141,6 +141,7 @@ vcl\
wizards\
writerfilter\
writerperfect\
+x11_extensions\
xmerge\
xml2cmp\
xmlhelp\
@@ -238,7 +239,6 @@ testtools\
tomcat\
udm\
vigra\
-x11_extensions\
xpdf\
xsltml\
zlib\
diff --git a/x11_extensions/Makefile b/x11_extensions/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/x11_extensions/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/x11_extensions/Module_x11_extensions.mk
b/x11_extensions/Module_x11_extensions.mk
new file mode 100644
index 0000000..eadf1a7
--- /dev/null
+++ b/x11_extensions/Module_x11_extensions.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# 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) 2012 Red Hat, Inc., David Tardon <dtar...@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_Module_Module,x11_extensions))
+
+$(eval $(call gb_Module_add_targets,x11_extensions,\
+ Package_inc \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/x11_extensions/Package_inc.mk b/x11_extensions/Package_inc.mk
new file mode 100644
index 0000000..8845d16
--- /dev/null
+++ b/x11_extensions/Package_inc.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# 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) 2012 Red Hat, Inc., David Tardon <dtar...@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_Package_Package,x11_extensions_inc,$(SRCDIR)/x11_extensions/inc))
+
+$(eval $(call
gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/randr.h,randr.h))
+$(eval $(call
gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/randrproto.h,randrproto.h))
+$(eval $(call
gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/render.h,render.h))
+$(eval $(call
gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/renderproto.h,renderproto.h))
+$(eval $(call
gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/shapeconst.h,shapeconst.h))
+$(eval $(call
gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/shape.h,shape.h))
+$(eval $(call
gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/Xrandr.h,Xrandr.h))
+$(eval $(call
gb_Package_add_file,x11_extensions_inc,inc/X11/extensions/Xrender.h,Xrender.h))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/x11_extensions/prj/d.lst b/x11_extensions/prj/d.lst
index d3c8c6a..e69de29 100644
--- a/x11_extensions/prj/d.lst
+++ b/x11_extensions/prj/d.lst
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\inc\X11
-mkdir: %_DEST%\inc\X11\extensions
-
-..\inc\*.h %_DEST%\inc\X11\extensions\*.h
-
diff --git a/x11_extensions/prj/dmake b/x11_extensions/prj/dmake
deleted file mode 100644
index e69de29..0000000
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
