[maemo-commits] [maemo-commits] r8329 - in projects/haf/trunk/maemo-theme-tools: . scripts src
From: www-data at stage.maemo.org www-data at stage.maemo.orgDate: Mon Nov 27 13:21:16 EET 2006
- Previous message: [maemo-commits] r8328 - in projects/haf/trunk/maemo-theme-layout-3: . rc scripts
- Next message: [maemo-commits] r8330 - projects/haf/trunk/osso-af-startup/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: mdk Date: 2006-11-27 13:21:14 +0200 (Mon, 27 Nov 2006) New Revision: 8329 Modified: projects/haf/trunk/maemo-theme-tools/ChangeLog projects/haf/trunk/maemo-theme-tools/scripts/hildon-theme-install projects/haf/trunk/maemo-theme-tools/src/Makefile.am projects/haf/trunk/maemo-theme-tools/src/colourizer.c projects/haf/trunk/maemo-theme-tools/src/colourizer.h projects/haf/trunk/maemo-theme-tools/src/outliner.c projects/haf/trunk/maemo-theme-tools/src/outliner.h projects/haf/trunk/maemo-theme-tools/src/regenerator.c projects/haf/trunk/maemo-theme-tools/src/regenerator.h projects/haf/trunk/maemo-theme-tools/src/slicer.c projects/haf/trunk/maemo-theme-tools/src/slicer.h Log: Fixes to match the latest layout semantics. Removing the silly EXEC_ thing and sticking to default g_get_prgname (). Makes more sense. Modified: projects/haf/trunk/maemo-theme-tools/ChangeLog =================================================================== --- projects/haf/trunk/maemo-theme-tools/ChangeLog 2006-11-27 11:14:10 UTC (rev 8328) +++ projects/haf/trunk/maemo-theme-tools/ChangeLog 2006-11-27 11:21:14 UTC (rev 8329) @@ -1,3 +1,19 @@ +2006-11-27 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com> + + * scripts/hildon-theme-install: Fixes to match the latest layout + semantics. + + * src/Makefile.am: + * src/colourizer.c: + * src/colourizer.h: + * src/outliner.c: + * src/outliner.h: + * src/regenerator.c: + * src/regenerator.h: + * src/slicer.c: + * src/slicer.h: Removing the silly EXEC_ thing and sticking to default + g_get_prgname (). Makes more sense. + 2006-11-22 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com> * configure.ac: Removing pedantic flag. Modified: projects/haf/trunk/maemo-theme-tools/scripts/hildon-theme-install =================================================================== --- projects/haf/trunk/maemo-theme-tools/scripts/hildon-theme-install 2006-11-27 11:14:10 UTC (rev 8328) +++ projects/haf/trunk/maemo-theme-tools/scripts/hildon-theme-install 2006-11-27 11:21:14 UTC (rev 8329) @@ -37,7 +37,7 @@ if ($themedir eq "" or $layoutdir eq "" or $template eq "") { - die "usage: hildon-install-theme --layout DIR --theme DIR --template FILE\n"; + die "usage: hildon-theme-install --layout DIR --theme DIR --template FILE\n"; } if ($name eq "") @@ -65,7 +65,7 @@ sub process_gtkrc { - my $source = "$layoutdir/rc/$_[0]"; + my $source = "$layoutdir/$_[0]"; my $file; open ($file, "< $source"); Modified: projects/haf/trunk/maemo-theme-tools/src/Makefile.am =================================================================== --- projects/haf/trunk/maemo-theme-tools/src/Makefile.am 2006-11-27 11:14:10 UTC (rev 8328) +++ projects/haf/trunk/maemo-theme-tools/src/Makefile.am 2006-11-27 11:21:14 UTC (rev 8329) @@ -4,23 +4,29 @@ hildon-theme-outliner # Slicer -hildon_theme_slicer_CFLAGS = $(GTK_CFLAGS) -DEXEC_NAME=\"hildon-theme-slicer\" +hildon_theme_slicer_CFLAGS = $(GTK_CFLAGS) hildon_theme_slicer_LDADD = $(GTK_LIBS) hildon_theme_slicer_SOURCES = slicer.c common.c # Colourizer -hildon_theme_colourizer_CFLAGS = $(GTK_CFLAGS) -DEXEC_NAME=\"hildon-theme-colourizer\" +hildon_theme_colourizer_CFLAGS = $(GTK_CFLAGS) hildon_theme_colourizer_LDADD = $(GTK_LIBS) hildon_theme_colourizer_SOURCES = colourizer.c common.c # Regenerator -hildon_theme_regenerator_CFLAGS = $(GTK_CFLAGS) -DEXEC_NAME=\"hildon-theme-regenerator\" +hildon_theme_regenerator_CFLAGS = $(GTK_CFLAGS) hildon_theme_regenerator_LDADD = $(GTK_LIBS) hildon_theme_regenerator_SOURCES = regenerator.c common.c # Outliner -hildon_theme_outliner_CFLAGS = $(GTK_CFLAGS) -DEXEC_NAME=\"hildon-theme-outliner\" +hildon_theme_outliner_CFLAGS = $(GTK_CFLAGS) hildon_theme_outliner_LDADD = $(GTK_LIBS) hildon_theme_outliner_SOURCES = outliner.c common.c MAINTAINERCLEANFILES = Makefile.in + +noinst_HEADERS = common.h \ + colourizer.h \ + regenerator.h \ + outliner.h \ + slicer.h Modified: projects/haf/trunk/maemo-theme-tools/src/colourizer.c =================================================================== --- projects/haf/trunk/maemo-theme-tools/src/colourizer.c 2006-11-27 11:14:10 UTC (rev 8328) +++ projects/haf/trunk/maemo-theme-tools/src/colourizer.c 2006-11-27 11:21:14 UTC (rev 8329) @@ -75,7 +75,7 @@ /* Show some info about basic usage of the tool */ void show_usage (void) { - g_print ("Usage: %s <template> <image>\n\n", EXEC_NAME); + g_print ("Usage: %s <template> <image>\n\n", g_get_prgname ()); g_print ("This tool will output a Perl substitution array. \n" "It should be used to substitute the Gtk Stock colors in various RC files.\n\n"); } Modified: projects/haf/trunk/maemo-theme-tools/src/colourizer.h =================================================================== --- projects/haf/trunk/maemo-theme-tools/src/colourizer.h 2006-11-27 11:14:10 UTC (rev 8328) +++ projects/haf/trunk/maemo-theme-tools/src/colourizer.h 2006-11-27 11:21:14 UTC (rev 8329) @@ -23,10 +23,6 @@ #include <glib.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#ifndef EXEC_NAME -#define EXEC_NAME "colourizer" -#endif - int main (int argc, char **argv); void show_usage (void); Modified: projects/haf/trunk/maemo-theme-tools/src/outliner.c =================================================================== --- projects/haf/trunk/maemo-theme-tools/src/outliner.c 2006-11-27 11:14:10 UTC (rev 8328) +++ projects/haf/trunk/maemo-theme-tools/src/outliner.c 2006-11-27 11:21:14 UTC (rev 8329) @@ -86,7 +86,7 @@ /* Show some info about basic usage of the tool */ void show_usage (void) { - g_print ("Usage: %s <template> <outputimage>\n\n", EXEC_NAME); + g_print ("Usage: %s <template> <outputimage>\n\n", g_get_prgname ()); g_print ("This tool will create an outline image that shows the slicing guides. \n" "You can use this image in your graphics program to check if your drawings\n" "fit the proper areas. \n\n"); Modified: projects/haf/trunk/maemo-theme-tools/src/outliner.h =================================================================== --- projects/haf/trunk/maemo-theme-tools/src/outliner.h 2006-11-27 11:14:10 UTC (rev 8328) +++ projects/haf/trunk/maemo-theme-tools/src/outliner.h 2006-11-27 11:21:14 UTC (rev 8329) @@ -25,10 +25,6 @@ #include <stdlib.h> #include <string.h> -#ifndef EXEC_NAME -#define EXEC_NAME "outliner" -#endif - int main (int argc, char **argv); void show_usage (void); Modified: projects/haf/trunk/maemo-theme-tools/src/regenerator.c =================================================================== --- projects/haf/trunk/maemo-theme-tools/src/regenerator.c 2006-11-27 11:14:10 UTC (rev 8328) +++ projects/haf/trunk/maemo-theme-tools/src/regenerator.c 2006-11-27 11:21:14 UTC (rev 8329) @@ -88,7 +88,7 @@ /* Show some info about basic usage of the tool */ void show_usage (void) { - g_print ("Usage: %s <template> <outputimage> [inputdir]\n\n", EXEC_NAME); + g_print ("Usage: %s <template> <outputimage> [inputdir]\n\n", g_get_prgname ()); g_print ("This tool will combine individual images (ie. previously sliced) into one huge\n" "image template as specified by the layout template. Optionally you can specify an\n" "input directory. The tool can load in PNG and JPEG formats.\n\n"); Modified: projects/haf/trunk/maemo-theme-tools/src/regenerator.h =================================================================== --- projects/haf/trunk/maemo-theme-tools/src/regenerator.h 2006-11-27 11:14:10 UTC (rev 8328) +++ projects/haf/trunk/maemo-theme-tools/src/regenerator.h 2006-11-27 11:21:14 UTC (rev 8329) @@ -25,10 +25,6 @@ #include <stdlib.h> #include <string.h> -#ifndef EXEC_NAME -#define EXEC_NAME "regenerator" -#endif - int main (int argc, char **argv); void show_usage (void); Modified: projects/haf/trunk/maemo-theme-tools/src/slicer.c =================================================================== --- projects/haf/trunk/maemo-theme-tools/src/slicer.c 2006-11-27 11:14:10 UTC (rev 8328) +++ projects/haf/trunk/maemo-theme-tools/src/slicer.c 2006-11-27 11:21:14 UTC (rev 8329) @@ -89,7 +89,7 @@ /* Show some info about basic usage of the tool */ void show_usage (void) { - g_print ("Usage: %s <template> <image> [outputdir]\n\n", EXEC_NAME); + g_print ("Usage: %s <template> <image> [outputdir]\n\n", g_get_prgname ()); g_print ("This tool will slice the input image into individual graphic pieces,\n" "as specified by the template. Optionally you can specify an output directory.\n" "If the directory is not present, it'll be created.\n\n"); Modified: projects/haf/trunk/maemo-theme-tools/src/slicer.h =================================================================== --- projects/haf/trunk/maemo-theme-tools/src/slicer.h 2006-11-27 11:14:10 UTC (rev 8328) +++ projects/haf/trunk/maemo-theme-tools/src/slicer.h 2006-11-27 11:21:14 UTC (rev 8329) @@ -27,10 +27,6 @@ #define JPEG_QUALITY "99" -#ifndef EXEC_NAME -#define EXEC_NAME "slicer" -#endif - int main (int argc, char **argv); void show_usage (void);
- Previous message: [maemo-commits] r8328 - in projects/haf/trunk/maemo-theme-layout-3: . rc scripts
- Next message: [maemo-commits] r8330 - projects/haf/trunk/osso-af-startup/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]