From 2fcd63b838301d2f0efde483ae1267c1fd5b72ed Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Mon, 2 Jan 2012 16:28:26 -0800 Subject: [PATCH] Mac OS debugging, update gen rules --- config.mk.sample | 2 +- mac/Makefile | 56 +++++++++++++++++++++++++++++++++---------- mac/aweather.bundle | 8 ++++--- mac/aweather.launcher | 2 +- src/Makefile | 23 +++++++++++------- win/Makefile | 15 +++++++++--- 6 files changed, 77 insertions(+), 29 deletions(-) diff --git a/config.mk.sample b/config.mk.sample index 7c3df8c..0a67df5 100644 --- a/config.mk.sample +++ b/config.mk.sample @@ -1,7 +1,7 @@ FILES = /scratch/aweather-pkg/files VER_AWEATHER = 0.6.1 -VER_GRITS = 0.6.1 +VER_GRITS = 0.6.2 VER_RSL = 1.42 SRC_AWEATHER = /scratch/aweather diff --git a/mac/Makefile b/mac/Makefile index 43d9810..02a79cb 100644 --- a/mac/Makefile +++ b/mac/Makefile @@ -1,6 +1,7 @@ include ../config.mk DESTDIR = $(MAC_AWEATHER)/build +SRCDMG = $(MAC_AWEATHER)/aweather-$(VER_AWEATHER).dmg PACKAGES = $(FILES)/aweather-$(VER_AWEATHER).dmg GTKINST = /Users/andy/gtk/inst export DESTDIR GTKINST MAC_AWEATHER @@ -8,7 +9,13 @@ export DESTDIR GTKINST MAC_AWEATHER all-mac: $(PACKAGES) @echo all-mac -$(DESTDIR): $(MAC_AWEATHER)/src/aweather +clean: + rm -rf $(PACKAGES) $(SRCDMG) \ + $(DESTDIR) $(MAC_AWEATHER)/AWeather.app + +$(DESTDIR): $(MAC_AWEATHER)/src/aweather \ + $(MAC_GRITS)/src/libgrits.la \ + $(MAC_RSL)/src/librsl.la make -C $(MAC_AWEATHER) install make -C $(MAC_GRITS) install make -C $(MAC_RSL) install @@ -18,24 +25,49 @@ $(DESTDIR): $(MAC_AWEATHER)/src/aweather rm -rf $(DESTDIR)/include touch $@ +$(MAC_AWEATHER)/src/aweather: \ + $(MAC_GRITS)/src/libgrits.la \ + $(MAC_RSL)/src/librsl.la + jhbuild run make -C $(MAC_AWEATHER) + +$(MAC_GRITS)/src/libgrits.la: + jhbuild run make -C $(MAC_GRITS) + +$(MAC_RSL)/src/librsl.la: + jhbuild run make -C $(MAC_RSL) + $(PACKAGES): $(DESTDIR) + rm -f $(SRCDMG) + ln -sf /usr/bin/open $(GTKINST)/bin/xdg-open rsync -uav $(DESTDIR)/ $(GTKINST)/ jhbuild run gtk-mac-bundler aweather.bundle create-dmg --volname 'AWeather-$(VER_AWEATHER)' \ - $(MAC_AWEATHER)/aweather-$(VER_AWEATHER).dmg \ - $(MAC_AWEATHER)/AWeather.app - $(MAC_AWEATHER)/aweather-$(VER_AWEATHER).dmg - cp $(FILES) + $(SRCDMG) $(MAC_AWEATHER)/AWeather.app + cp $(SRCDMG) $(FILES) aweather-gen: - PKG_CONFIG_PATH="../grits/src/" \ - ./autogen.sh "--enable-relative" \ - CFLAGS="-g -Werror $(CFLAGS)" + cd $(MAC_AWEATHER); \ + PKG_CONFIG_PATH="$(MAC_GRITS)/src" \ + LDFLAGS="-L$(MAC_GRITS)/src/.libs" \ + CPPFLAGS=dir="-I$(MAC_GRITS)/include" \ + jhbuild run ./autogen.sh \ + --enable-relative \ + --enable-shared \ + --disable-static \ + CFLAGS="-g -Werror -Os" grits-gen: - ./autogen.sh \ + cd $(MAC_GRITS); \ + jhbuild run ./autogen.sh \ + --enable-relative \ + --enable-shared \ + --disable-static \ + CFLAGS="-g -Werror -Os" + +rsl-gen: + cd $(MAC_RSL); \ + jhbuild run ./autogen.sh \ + --enable-relative \ --enable-shared \ --disable-static \ - "--libdir=$(MAC_GRITS)/src/.libs" \ - "--includedir=$(MAC_GRITS)/include" \ - CFLAGS="-g -Werror" + CFLAGS="-g -Wall -Wno-unused -Os" diff --git a/mac/aweather.bundle b/mac/aweather.bundle index 64d5f9d..e526fe3 100644 --- a/mac/aweather.bundle +++ b/mac/aweather.bundle @@ -17,9 +17,11 @@ ${prefix}/bin/xdg-open ${prefix}/lib/aweather/*.so ${prefix}/lib/grits2/*.so + ${prefix}/lib/libgrits* + ${prefix}/lib/librsl* ${prefix}/share/aweather ${prefix}/share/doc/aweather - ${prefix}/share/rsl/*.dat + ${prefix}/share/rsl1/*.dat ${prefix}/share/icons/hicolor/16x16/apps/aweather.png ${prefix}/share/icons/hicolor/22x22/apps/aweather.png ${prefix}/share/icons/hicolor/24x24/apps/aweather.png @@ -35,7 +37,7 @@ ${prefix}/share/themes/Clearlooks ${prefix}/share/themes/Default - ${prefix}/share/themes/Mac - ${prefix}/share/themes/Quartz + + ${project}/aweather.gtkrc diff --git a/mac/aweather.launcher b/mac/aweather.launcher index 63a2980..816cda2 100755 --- a/mac/aweather.launcher +++ b/mac/aweather.launcher @@ -14,7 +14,7 @@ export GTK_PATH="$PREFIX" export GTK2_RC_FILES="$PREFIX/etc/gtk-2.0/gtkrc" export GTK_IM_MODULE_FILE="$PREFIX/etc/gtk-2.0/gtk.immodules" export GDK_PIXBUF_MODULE_FILE="$PREFIX/etc/gtk-2.0/gdk-pixbuf.loaders" -export PANGO_RC_FILE="$PREFIX/etc/pango/pangorc" +#export PANGO_RC_FILE="$PREFIX/etc/pango/pangorc" export PATH="$PATH:$PREFIX/bin" diff --git a/src/Makefile b/src/Makefile index b1d740b..efc6c22 100644 --- a/src/Makefile +++ b/src/Makefile @@ -22,18 +22,23 @@ $(PACKAGES): aweather-gen: cd $(SRC_AWEATHER); \ - PKG_CONFIG_PATH="$(MAC_GRITS)" \ - LIBS="-L$(MAC_GRITS)" \ - CPPFLAGS="-I$(MAC_GRITS)" \ + PKG_CONFIG_PATH="$(SRC_GRITS)/src" \ ./autogen.sh \ - --enable-shared \ - --disable-static \ - CFLAGS="-g -Werror $CFLAGS" + --datadir="$(SRC_AWEATHER)/data" \ + --libdir="$(SRC_AWEATHER)/src/plugins" \ + CFLAGS="-g -Werror $(CFLAGS)" grits-gen: cd $(SRC_GRITS); \ ./autogen.sh \ - "--enable-gtk-doc" \ - "--libdir=$(SRC_GRITS)/src/.libs" \ - "--includedir=$(SRC_GRITS)/include" \ + --enable-gtk-doc \ + --includedir="$(SRC_GRITS)/include" \ + --libdir="$(SRC_GRITS)/src/.libs" \ CFLAGS="-g -Werror $(CFLAGS)" + +rsl-gen: + cd $(SRC_RSL); \ + ./autogen.sh \ + --enable-shared \ + --disable-static \ + CFLAGS="-g -Wall -O3" diff --git a/win/Makefile b/win/Makefile index e4c63d4..96982ac 100644 --- a/win/Makefile +++ b/win/Makefile @@ -32,9 +32,9 @@ $(INSTALLERS): $(DESTDIR) aweather-gen: cd $(WIN_AWEATHER); \ PKG_CONFIG_PATH="$(WIN_GRITS)" \ - LIBS="-L$(WIN_GRITS)"\ - CPPFLAGS="-I$(WIN_GRITS)"\ - CFLAGS="-g -Werror -Wno-unused -O3"\ + LIBS="-L$(WIN_GRITS)" \ + CPPFLAGS="-I$(WIN_GRITS)" \ + CFLAGS="-g -Werror -Wno-unused -O3" \ ./autogen.sh \ --enable-shared \ --disable-static \ @@ -47,3 +47,12 @@ grits-gen: --disable-static \ --host=i686-pc-mingw32 \ CFLAGS="-g -Werror -Wno-unused -O3" + +rsl-gen: + cd $(WIN_RSL); \ + ./autogen.sh \ + --enable-relative \ + --enable-shared \ + --disable-static \ + --host=i686-pc-mingw32 \ + CFLAGS="-g -Wall -Wno-unused -O3" -- 2.43.2