X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=306e115e42bc73a1223dd8e1ef70ed65cd4a9789;hb=refs%2Fbuilds%2F20130922030503%2Fpspp;hp=72ec791a5e2c615b6715ef0bcf17f302cbd62745;hpb=8539c057c6889ff335da0e00117cc0f5fb9bf72d;p=pspp diff --git a/Smake b/Smake index 72ec791a5e..306e115e42 100644 --- a/Smake +++ b/Smake @@ -48,11 +48,13 @@ GNULIB_MODULES = \ mbiter \ memcasecmp \ memchr \ + memchr2 \ mempcpy \ memrchr \ minmax \ mkdtemp \ mkstemp \ + pipe2 \ printf-posix \ printf-safe \ progname \ @@ -62,12 +64,14 @@ GNULIB_MODULES = \ relocatable-prog \ rename \ round \ + select \ snprintf \ snprintf-posix \ sprintf-posix \ stdarg \ stdbool \ stdint \ + strcasestr \ stpcpy \ strerror \ strftime \ @@ -81,8 +85,7 @@ GNULIB_MODULES = \ unicase/u8-tolower \ unicase/u8-toupper \ unictype/ctype-print \ - unictype/property-id-continue \ - unictype/property-id-start \ + unictype/category-of \ unigbrk/uc-is-grapheme-break \ unilbrk/u8-possible-linebreaks \ uninorm/nfkd \ @@ -115,9 +118,227 @@ GNULIB_MODULES = \ xstrndup \ xvasprintf -all: prep_ph +APP_ICONS = \ +src/ui/gui/icons/apps/32x32/pspp.png \ +src/ui/gui/icons/apps/22x22/pspp.png \ +src/ui/gui/icons/apps/24x24/pspp.png \ +src/ui/gui/icons/apps/256x256/pspp.png \ +src/ui/gui/icons/apps/16x16/pspp.png \ +src/ui/gui/icons/apps/48x48/pspp.png + + + +CATEGORY_ICONS = \ +src/ui/gui/icons/categories/24x24/variable-string-nominal.png \ +src/ui/gui/icons/categories/24x24/align-center.png \ +src/ui/gui/icons/categories/24x24/variable-nominal.png \ +src/ui/gui/icons/categories/24x24/align-left.png \ +src/ui/gui/icons/categories/24x24/variable-date-scale.png \ +src/ui/gui/icons/categories/24x24/variable-scale.png \ +src/ui/gui/icons/categories/24x24/variable-string-ordinal.png \ +src/ui/gui/icons/categories/24x24/variable-ordinal.png \ +src/ui/gui/icons/categories/24x24/align-right.png \ +src/ui/gui/icons/categories/24x24/variable-date-nominal.png \ +src/ui/gui/icons/categories/24x24/variable-date-ordinal.png \ +src/ui/gui/icons/categories/24x24/variable-string-scale.png \ +src/ui/gui/icons/categories/16x16/variable-string-nominal.png \ +src/ui/gui/icons/categories/16x16/align-center.png \ +src/ui/gui/icons/categories/16x16/variable-nominal.png \ +src/ui/gui/icons/categories/16x16/align-left.png \ +src/ui/gui/icons/categories/16x16/variable-date-scale.png \ +src/ui/gui/icons/categories/16x16/variable-scale.png \ +src/ui/gui/icons/categories/16x16/variable-string-ordinal.png \ +src/ui/gui/icons/categories/16x16/variable-ordinal.png \ +src/ui/gui/icons/categories/16x16/align-right.png \ +src/ui/gui/icons/categories/16x16/variable-date-nominal.png \ +src/ui/gui/icons/categories/16x16/variable-date-ordinal.png \ +src/ui/gui/icons/categories/16x16/variable-string-scale.png \ +src/ui/gui/icons/categories/16x16/variable-role-partition.png \ +src/ui/gui/icons/categories/16x16/variable-role-target.png \ +src/ui/gui/icons/categories/16x16/variable-role-split.png \ +src/ui/gui/icons/categories/16x16/variable-role-input.png \ +src/ui/gui/icons/categories/16x16/variable-role-none.png \ +src/ui/gui/icons/categories/16x16/variable-role-both.png + +MIMETYPE_ICONS = \ +src/ui/gui/icons/mimetypes/32x32/application-x-spss-por.png \ +src/ui/gui/icons/mimetypes/32x32/application-x-spss-sav.png \ +src/ui/gui/icons/mimetypes/32x32/application-x-spss-sps.png \ +src/ui/gui/icons/mimetypes/22x22/application-x-spss-por.png \ +src/ui/gui/icons/mimetypes/22x22/application-x-spss-sav.png \ +src/ui/gui/icons/mimetypes/22x22/application-x-spss-sps.png \ +src/ui/gui/icons/mimetypes/24x24/application-x-spss-por.png \ +src/ui/gui/icons/mimetypes/24x24/application-x-spss-sav.png \ +src/ui/gui/icons/mimetypes/24x24/application-x-spss-sps.png \ +src/ui/gui/icons/mimetypes/256x256/application-x-spss-por.png \ +src/ui/gui/icons/mimetypes/256x256/application-x-spss-sav.png \ +src/ui/gui/icons/mimetypes/256x256/application-x-spss-sps.png \ +src/ui/gui/icons/mimetypes/16x16/application-x-spss-por.png \ +src/ui/gui/icons/mimetypes/16x16/application-x-spss-sav.png \ +src/ui/gui/icons/mimetypes/16x16/application-x-spss-sps.png \ +src/ui/gui/icons/mimetypes/48x48/application-x-spss-por.png \ +src/ui/gui/icons/mimetypes/48x48/application-x-spss-sav.png \ +src/ui/gui/icons/mimetypes/48x48/application-x-spss-sps.png \ + +MISC_ICONS = src/ui/gui/icons/splash.png \ +src/ui/gui/icons/about-logo.png + + + +ACTION_ICONS = \ +src/ui/gui/icons/actions/24x24/edit-copy.png \ +src/ui/gui/icons/actions/24x24/windows-split.png \ +src/ui/gui/icons/actions/24x24/edit-paste.png \ +src/ui/gui/icons/actions/24x24/help-reference-manual.png \ +src/ui/gui/icons/actions/24x24/view-value-labels.png \ +src/ui/gui/icons/actions/24x24/file-print-document.png \ +src/ui/gui/icons/actions/24x24/file-open-document.png \ +src/ui/gui/icons/actions/24x24/transform-runpending-transforms.png \ +src/ui/gui/icons/actions/24x24/file-save-document.png \ +src/ui/gui/icons/actions/24x24/file-rename-dataset.png \ +src/ui/gui/icons/actions/24x24/edit-select-all.png \ +src/ui/gui/icons/actions/24x24/file-display-information.png \ +src/ui/gui/icons/actions/24x24/edit-insert-variable.png \ +src/ui/gui/icons/actions/24x24/file-export-document.png \ +src/ui/gui/icons/actions/24x24/utilities-case.png \ +src/ui/gui/icons/actions/24x24/data-sort-cases.png \ +src/ui/gui/icons/actions/24x24/utilities-variable.png \ +src/ui/gui/icons/actions/24x24/edit-clear-data.png \ +src/ui/gui/icons/actions/24x24/utilities-datafile-comments.png \ +src/ui/gui/icons/actions/24x24/windows-minimize.png \ +src/ui/gui/icons/actions/24x24/transform-recode-different-variables.png \ +src/ui/gui/icons/actions/24x24/transform-compute.png \ +src/ui/gui/icons/actions/24x24/recent-dialogs.png \ +src/ui/gui/icons/actions/24x24/transform-count.png \ +src/ui/gui/icons/actions/24x24/edit-goto-case.png \ +src/ui/gui/icons/actions/24x24/data-split-file.png \ +src/ui/gui/icons/actions/24x24/help-about.png \ +src/ui/gui/icons/actions/24x24/transform-automatic-recode.png \ +src/ui/gui/icons/actions/24x24/data-transpose.png \ +src/ui/gui/icons/actions/24x24/edit-search-case.png \ +src/ui/gui/icons/actions/24x24/view-fullscreen.png \ +src/ui/gui/icons/actions/24x24/edit-add-variable.png \ +src/ui/gui/icons/actions/24x24/data-select-case.png \ +src/ui/gui/icons/actions/24x24/file-import-document.png \ +src/ui/gui/icons/actions/24x24/data-weight-cases.png \ +src/ui/gui/icons/actions/24x24/edit-add-case.png \ +src/ui/gui/icons/actions/24x24/edit-insert-case.png \ +src/ui/gui/icons/actions/24x24/file-quit.png \ +src/ui/gui/icons/actions/24x24/file-recently-used.png \ +src/ui/gui/icons/actions/24x24/edit-goto-variable.png \ +src/ui/gui/icons/actions/24x24/transform-rank-cases.png \ +src/ui/gui/icons/actions/24x24/transform-recode-same-variables.png \ +src/ui/gui/icons/actions/24x24/view-fonts.png \ +src/ui/gui/icons/actions/24x24/file-saveas-document.png \ +src/ui/gui/icons/actions/24x24/edit-cut.png \ +src/ui/gui/icons/actions/24x24/file-new-document.png \ +src/ui/gui/icons/actions/24x24/data-aggregate.png \ +src/ui/gui/icons/actions/16x16/edit-copy.png \ +src/ui/gui/icons/actions/16x16/windows-split.png \ +src/ui/gui/icons/actions/16x16/edit-paste.png \ +src/ui/gui/icons/actions/16x16/help-reference-manual.png \ +src/ui/gui/icons/actions/16x16/view-value-labels.png \ +src/ui/gui/icons/actions/16x16/file-print-document.png \ +src/ui/gui/icons/actions/16x16/file-open-document.png \ +src/ui/gui/icons/actions/16x16/transform-runpending-transforms.png \ +src/ui/gui/icons/actions/16x16/file-save-document.png \ +src/ui/gui/icons/actions/16x16/file-rename-dataset.png \ +src/ui/gui/icons/actions/16x16/edit-select-all.png \ +src/ui/gui/icons/actions/16x16/file-display-information.png \ +src/ui/gui/icons/actions/16x16/edit-insert-variable.png \ +src/ui/gui/icons/actions/16x16/file-export-document.png \ +src/ui/gui/icons/actions/16x16/utilities-case.png \ +src/ui/gui/icons/actions/16x16/data-sort-cases.png \ +src/ui/gui/icons/actions/16x16/utilities-variable.png \ +src/ui/gui/icons/actions/16x16/edit-clear-data.png \ +src/ui/gui/icons/actions/16x16/utilities-datafile-comments.png \ +src/ui/gui/icons/actions/16x16/windows-minimize.png \ +src/ui/gui/icons/actions/16x16/transform-recode-different-variables.png \ +src/ui/gui/icons/actions/16x16/transform-compute.png \ +src/ui/gui/icons/actions/16x16/recent-dialogs.png \ +src/ui/gui/icons/actions/16x16/transform-count.png \ +src/ui/gui/icons/actions/16x16/edit-goto-case.png \ +src/ui/gui/icons/actions/16x16/data-split-file.png \ +src/ui/gui/icons/actions/16x16/help-about.png \ +src/ui/gui/icons/actions/16x16/transform-automatic-recode.png \ +src/ui/gui/icons/actions/16x16/data-transpose.png \ +src/ui/gui/icons/actions/16x16/edit-search-case.png \ +src/ui/gui/icons/actions/16x16/view-fullscreen.png \ +src/ui/gui/icons/actions/16x16/edit-add-variable.png \ +src/ui/gui/icons/actions/16x16/data-select-case.png \ +src/ui/gui/icons/actions/16x16/file-import-document.png \ +src/ui/gui/icons/actions/16x16/data-weight-cases.png \ +src/ui/gui/icons/actions/16x16/edit-add-case.png \ +src/ui/gui/icons/actions/16x16/edit-insert-case.png \ +src/ui/gui/icons/actions/16x16/file-quit.png \ +src/ui/gui/icons/actions/16x16/file-recently-used.png \ +src/ui/gui/icons/actions/16x16/edit-goto-variable.png \ +src/ui/gui/icons/actions/16x16/transform-rank-cases.png \ +src/ui/gui/icons/actions/16x16/transform-recode-same-variables.png \ +src/ui/gui/icons/actions/16x16/view-fonts.png \ +src/ui/gui/icons/actions/16x16/file-saveas-document.png \ +src/ui/gui/icons/actions/16x16/edit-cut.png \ +src/ui/gui/icons/actions/16x16/file-new-document.png \ +src/ui/gui/icons/actions/16x16/data-aggregate.png \ + +ICONS=$(CATEGORY_ICONS) $(ACTION_ICONS) $(MIMETYPE_ICONS) $(APP_ICONS) $(MISC_ICONS) + +all: prep_ph icons $(MAKE) -f Smake Makefile.in configure +icons: $(ICONS) src/ui/gui/icons/icon-names.c + +src/ui/gui/icons/icon-names.c: $(MAKEFILE_LIST) + $(RM) $@ + printf '/* This is a generated file. Do not edit. */\n' >> $@ + printf '#include "icon-names.h"\n' >> $@ + echo >> $@ + printf 'static const char *action_icon_name[] =' >> $@ + printf '\n{\n' >> $@ + for i in $(ACTION_ICONS) ; do \ + echo $$i; \ + done | sed -e 's%[a-zA-Z/]*/[1-9]*x[1-9]*/\([^ ]*\)\.png%\1%g' | sort -u | while read f ; do \ + printf ' "%s", \n' $$f >> $@ ; \ + done ; \ + printf '};\n\n' >> $@ ; \ + printf 'const struct icon_context action_icon_context = {\n' >> $@ + printf ' action_icon_name,\n' >> $@ + printf " sizeof (action_icon_name) / sizeof (action_icon_name[0]),\n" >> $@ + printf " \"actions\"\n" >> $@ + printf '};\n' >> $@ ; \ + echo >> $@ + printf 'static const char *category_icon_name[] =' >> $@ + printf '\n{\n' >> $@ + for i in $(CATEGORY_ICONS) ; do \ + echo $$i; \ + done | sed -e 's%[a-zA-Z/]*/[1-9]*x[1-9]*/\([^ ]*\)\.png%\1%g' | sort -u | while read f ; do \ + printf ' "%s", \n' $$f >> $@ ; \ + done ; \ + printf '};\n\n' >> $@ ; \ + printf 'const struct icon_context category_icon_context = {\n' >> $@ + printf ' category_icon_name,\n' >> $@ + printf " sizeof (category_icon_name) / sizeof (category_icon_name[0]),\n" >> $@ + printf " \"categories\"\n" >> $@ + printf '};\n' >> $@ ; \ + echo >> $@ + + +src/ui/gui/icons/manifest: $(MAKEFILE_LIST) + $(RM) $@ + printf '# This is a generated file. Do not edit.\n' >> $@ + printf 'icons =' >> $@ + for i in $(ICONS); do \ + printf ' \\\n\t '$$i >> $@; \ + done + echo >> $@ + echo >> $@ + printf 'icon_srcs = ' >> $@ + for i in $(ICONS); do \ + printf ' \\\n\t '$$i | sed -e 's/\.png$$/.svg/' -e 's%/icons/%/artwork/%' >> $@ ; \ + done + echo ' ' >> $@ + echo >> $@ + .PHONY: prep_ph prep_ph: test -e ChangeLog || touch ChangeLog @@ -127,7 +348,15 @@ prep_ph: --source-base=gl --lib=libgl --tests-base=tests \ --doc-base=gl/doc --aux-dir=build-aux \ --libtool $(GNULIB_MODULES) - libtoolize --force --automake + if (glibtoolize --version) >/dev/null 2>&1; then \ + LIBTOOLIZE=glibtoolize; \ + elif (libtoolize --version) >/dev/null 2>&1; then \ + LIBTOOLIZE=libtoolize; \ + else \ + echo >&2 "libtoolize not found"; \ + exit 1; \ + fi; \ + $$LIBTOOLIZE --force --automake aclocal.m4: aclocal -I m4 -I gl/m4 @@ -138,7 +367,7 @@ configure: configure.ac aclocal.m4 config.h.in: configure.ac autoheader -Makefile.in: Makefile.am config.h.in aclocal.m4 +Makefile.in: Makefile.am config.h.in aclocal.m4 src/ui/gui/icons/manifest automake --add-missing --copy --no-force --include-deps @@ -162,6 +391,8 @@ _debug: all test -d _debug || mkdir _debug cd _debug && ../configure $(CONFIGUREFLAGS) --enable-debug + + PO_FILES = po/ChangeLog \ po/Rules-quot po/boldquot.sed \ po/cat-id-tbl.c po/en@boldquot.header po/en@quot.header \ @@ -189,3 +420,18 @@ clean: rm -f reloc-ldflags install-reloc .PHONY: all gettextize clean + + +# The "convert" program from imagemagick can be used to create png from svg but doesn't properly deal +# with the alpha channels. Therefore, it is not recommended for production pspp builds, but might +# be useful to get something working on a platform which doesn't have a working gimp. + +#svg2png=convert $1 $3 + +svg2png=gimp -i -b '(let* ((image (car (gimp-file-load 1 "$1" "$1")))) (gimp-image-attach-parasite image (list "gimp-comment" 0 "$(shell cat $2)")) (gimp-file-save 1 image (car (gimp-image-get-active-drawable image)) "$3" "$3")) (gimp-quit 1)' + + +src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg src/ui/gui/icons/COPYING_CCBYSA3 + mkdir -p $(dir $@) + $(call svg2png,$<,$(lastword $^),$@) +