[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in icon-themes/README Makefile packimages/Makefile packimages/Module_packimages.mk packimages/pack packimages/Package_images.mk packimages/prj
Matus Kukan
mkukan at kemper.freedesktop.org
Fri Feb 17 11:05:07 PST 2012
Makefile | 2 -
config_host.mk.in | 1
configure.in | 11 ------
icon-themes/README | 2 -
packimages/Makefile | 7 ++++
packimages/Module_packimages.mk | 34 +++++++++++++++++++
packimages/Package_images.mk | 43 ++++++++++++++++++++++++
packimages/pack/Makefile | 70 ++++++++++++++++++++++++++++++++++++++++
packimages/pack/makefile.mk | 68 --------------------------------------
packimages/prj/build.lst | 3 -
packimages/prj/d.lst | 2 -
packimages/prj/makefile.mk | 1
12 files changed, 158 insertions(+), 86 deletions(-)
New commits:
commit 7f267db9b30fb90fe53844f659d4efa599034b5c
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Feb 17 14:40:04 2012 +0100
SOLAREXTRALIB unused
diff --git a/config_host.mk.in b/config_host.mk.in
index 8d38959..1abf218 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -367,7 +367,6 @@ export SIZEOF_LONGLONG=@SIZEOF_LONGLONG@
export SIZEOF_POINTER=@SIZEOF_POINTER@
export SIZEOF_SHORT=@SIZEOF_SHORT@
export SOLARENV=@SRC_ROOT@/solenv
-export SOLAREXTRALIB=@SOLAREXTRALIB@
export SOLARINC=@SOLARINC@
export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@
export SOLARLIB=@SOLARLIB@
diff --git a/configure.in b/configure.in
index 0f45e09..e424560 100644
--- a/configure.in
+++ b/configure.in
@@ -2721,7 +2721,6 @@ aix*)
OS=AIX
OUTPATH=unxaigppc
P_SEP=:
- SOLAREXTRALIB="-L../$LIB64"
SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
@@ -2810,7 +2809,6 @@ dragonfly*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
esac
- SOLAREXTRALIB="-L../$LIB64"
SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
@@ -2838,7 +2836,6 @@ freebsd*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
esac
- SOLAREXTRALIB="-L../$LIB64"
SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
@@ -2867,7 +2864,6 @@ kfreebsd*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
esac
- SOLAREXTRALIB="-L../$LIB64"
SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
@@ -2975,7 +2971,6 @@ linux-gnu*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
esac
- SOLAREXTRALIB="-L../$LIB64"
SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
@@ -3061,7 +3056,6 @@ mingw*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
esac
- SOLAREXTRALIB="-L../$LIB64"
SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
@@ -3088,7 +3082,6 @@ openbsd*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
esac
- SOLAREXTRALIB="-L../$LIB64"
SOLARINC="$SOLARINC -I/usr/local/include"
SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
@@ -3120,9 +3113,6 @@ solaris*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
esac
- SOLAREXTRALIB="-L../$LIB -L$SRC_ROOT/solenv/$OUTPATH/lib.solaris.2.6"
- SOLAREXTRALIB="$SOLAREXTRALIB -L/lib -L/usr/lib"
- SOLAREXTRALIB="$SOLAREXTRALIB -L/usr/local/bin -L/usr/dt/lib -L/usr/openwin/lib"
SOLARINC="$SOLARINC -I/usr/local/include"
SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
SOLARLIB="$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
@@ -3155,7 +3145,6 @@ AC_SUBST(OS)
AC_SUBST(OUTDIR)
AC_SUBST(OUTPATH)
AC_SUBST(P_SEP)
-AC_SUBST(SOLAREXTRALIB)
AC_SUBST(WORKDIR)
dnl ===================================================================
commit 5a4e4d5543edd47f4b411c0f2fa43d1a0e6a1ff7
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Feb 16 20:18:13 2012 +0100
packimages: convert to gbuild
diff --git a/Makefile b/Makefile
index d4dd3d9..cb99243 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,7 @@ officecfg\
oovbaapi\
oox\
package\
+packimages\
padmin\
psprint_config\
qadevOOo\
@@ -201,7 +202,6 @@ neon\
nss\
odk\
openssl\
-packimages\
pango\
postgresql\
postprocess\
diff --git a/icon-themes/README b/icon-themes/README
index 7655710..120c3ab 100644
--- a/icon-themes/README
+++ b/icon-themes/README
@@ -63,4 +63,4 @@ How to add a new image set:
vcl/source/app/settings.cxx
- The fallback for particular icons is defined in
- postprocess/packimages/pack/makefile.mk
+ packimages/pack/Makefile
diff --git a/packimages/Makefile b/packimages/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/packimages/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/packimages/Module_packimages.mk b/packimages/Module_packimages.mk
new file mode 100644
index 0000000..eca8c69
--- /dev/null
+++ b/packimages/Module_packimages.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 Matúš Kukan <matus.kukan at gmail.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,packimages))
+
+$(eval $(call gb_Module_add_targets,packimages,\
+ Package_images \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/packimages/Package_images.mk b/packimages/Package_images.mk
new file mode 100644
index 0000000..157a9e5
--- /dev/null
+++ b/packimages/Package_images.mk
@@ -0,0 +1,43 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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,packimages_images,$(WORKDIR)/CustomTarget/packimages/pack))
+
+$(eval $(call gb_Package_add_customtarget,packimages_images,packimages/pack))
+
+# hack to rerun custom target's makefile every time
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,packimages/pack,\
+ packimages_rerun \
+))
+packimages_rerun:
+
+$(eval $(call gb_Package_add_file,packimages_images,bin/images.zip,images.zip))
+
+$(foreach theme,$(WITH_THEMES) brand,\
+$(eval $(call gb_Package_add_file,packimages_images,bin/images_$(theme).zip,images_$(theme).zip)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/packimages/pack/Makefile b/packimages/pack/Makefile
new file mode 100644
index 0000000..5d88e25
--- /dev/null
+++ b/packimages/pack/Makefile
@@ -0,0 +1,70 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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.
+
+gb_PARTIALBUILD:=T
+include $(GBUILDDIR)/gbuild_simple.mk
+
+# Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially
+# (Tango fallbacks to Industrial for the missing icons)
+CUSTOM_images := $(foreach theme,$(WITH_THEMES),images_$(theme).zip)
+CUSTOM_PREFERRED_FALLBACK_1 := -c $(SRCDIR)/icon-themes/tango
+CUSTOM_PREFERRED_FALLBACK_2 := -c $(SRCDIR)/icon-themes/industrial
+
+# commandimagelist.ilst and sorted.lst are phony to rebuild everything each time
+.PHONY: all commandimagelist.ilst sorted.lst
+all: images.zip images_brand.zip $(CUSTOM_images)
+
+images.zip: commandimagelist.ilst sorted.lst
+ $(call gb_Helper_abbreviate_dirs_native, \
+ $(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \
+ -m $(SRCDIR)/icon-themes/galaxy -c . -l . -l $(OUTDIR)/res/img \
+ -s sorted.lst -o $@)
+
+images_%.zip: commandimagelist.ilst sorted.lst
+ $(call gb_Helper_abbreviate_dirs_native, \
+ $(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \
+ -m $(SRCDIR)/icon-themes/galaxy -c $(SRCDIR)/icon-themes/$* \
+ $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) \
+ -l . -l $(OUTDIR)/res/img -s sorted.lst -o $@)
+
+# make sure to have one to keep packing happy
+images_brand.zip:
+ @touch $@
+
+commandimagelist.ilst:
+ $(call gb_Helper_abbreviate_dirs_native, \
+ find $(SRCDIR)/icon-themes/galaxy/cmd -name "*.png" | \
+ sed "s#$(SRCDIR)/icon-themes/galaxy#%MODULE%#" | \
+ $(PERL) $(SOLARENV)/bin/sort.pl > $@.$(INPATH) && \
+ $(PERL) $(SOLARENV)/bin/diffmv.pl $@.$(INPATH) $@)
+
+sorted.lst: $(SRCDIR)/packimages/pack/image-sort.lst
+ $(call gb_Helper_abbreviate_dirs_native, \
+ $(PERL) $(SOLARENV)/bin/image-sort.pl $< $(OUTDIR)/xml $@)
+
+.DEFAULT_GOAL := all
+# vim: set noet sw=4 ts=4:
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk
deleted file mode 100644
index ebc6f81..0000000
--- a/packimages/pack/makefile.mk
+++ /dev/null
@@ -1,68 +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=packimages
-TARGET=packimages
-
-.INCLUDE: settings.mk
-# point to an existing directory as default that poses no threat
-# to a "find" that looks for "*.png"
-RSCCUSTOMIMG*=$(PRJ)
-.INCLUDE: target.mk
-
-IMAGES := $(COMMONBIN)$/images.zip
-SORTED_LIST=$(RES)$/img$/sorted.lst
-# Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially
-# (Tango fallbacks to Industrial for the missing icons)
-CUSTOM_IMAGE_SETS=$(WITH_THEMES)
-CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
-CUSTOM_PREFERRED_FALLBACK_1*=-c $(SRC_ROOT)/icon-themes$/tango
-CUSTOM_PREFERRED_FALLBACK_2*=-c $(SRC_ROOT)/icon-themes$/industrial
-
-ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
-
-$(IMAGES) $(CUSTOM_IMAGES) : $(SORTED_LIST)
-
-$(SORTED_LIST) : image-sort.lst
- +-$(MKDIR) $(RES)$/img
- +$(PERL) $(SOLARENV)$/bin$/image-sort.pl image-sort.lst $(SOLARXMLDIR) $@
-
-$(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST)
- @@-$(MKDIR) $(RES)$/img
-#+-$(RM) $@ $@.$(INPATH)
- $(FIND) $(SRC_ROOT)/$(RSCDEFIMG)/cmd -name "*.png" | sed "s#$(SRC_ROOT)/$(RSCDEFIMG)#%MODULE%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
- $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@
-
-$(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst
- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SRC_ROOT)/$(RSCDEFIMG) -m $(SRC_ROOT)/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
-
-images_% : $(RES)$/img$/commandimagelist.ilst
- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SRC_ROOT)/$(RSCDEFIMG) -m $(SRC_ROOT)/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SRC_ROOT)/icon-themes$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
-
-# make sure to have one to keep packing happy
-$(COMMONBIN)$/images_brand.zip:
- @$(TOUCH) $@
diff --git a/packimages/prj/build.lst b/packimages/prj/build.lst
index 01aa1e5..1692481 100644
--- a/packimages/prj/build.lst
+++ b/packimages/prj/build.lst
@@ -1,3 +1,2 @@
pim packimages :: postprocess NULL
-pim packimages usr1 - all pim_mkout NULL
-pim packimages\pack nmake - all pim_pack NULL
+pim packimages\prj nmake - all pim_prj NULL
diff --git a/packimages/prj/d.lst b/packimages/prj/d.lst
index 074a73c..e69de29 100644
--- a/packimages/prj/d.lst
+++ b/packimages/prj/d.lst
@@ -1,2 +0,0 @@
-mkdir: %COMMON_DEST%\bin
-..\%__SRC%\bin\*.zip %COMMON_DEST%\bin
diff --git a/packimages/prj/makefile.mk b/packimages/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/packimages/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
More information about the Libreoffice-commits
mailing list