Permalink
Browse files

Update the build to use pkg-config to copy unstable libraries rather …

…than adding their source to the tree

svn path=/trunk/monsoon/; revision=118432
  • Loading branch information...
2 parents 6aa2946 + dbe4bc3 commit 1110d275ebef60f9666b05bde0099997d749ec9c @alanmcgovern alanmcgovern committed Nov 10, 2008
Showing with 38 additions and 42 deletions.
  1. +4 −7 Makefile.am
  2. +20 −17 Monsoon/Makefile.am
  3. +1 −1 autogen.sh
  4. +10 −16 configure.in → configure.ac
  5. +3 −1 po/POTFILES.in
View
@@ -1,16 +1,13 @@
EXTRA_DIST = expansions.m4 \
- Monsoon/NLog.dll \
- bitsharp/MonoTorrent/bin/Release/MonoTorrent.dll \
- mono.nat/Mono.Nat/bin/Release/Mono.Nat.dll \
intltool-update.in \
intltool-extract.in \
intltool-merge.in
-SUBDIRS = bitsharp \
- mono.nat \
- Monsoon \
- po
+SUBDIRS = \
+ Monsoon \
+ po
+
run: all
mono --debug Monsoon/bin/Release/Monsoon.exe -d
View
@@ -1,5 +1,5 @@
-EXTRA_DIST =
+EXTRA_DIST = $(NLOG_DLL_SOURCE)
# Warning: This is an automatically generated file, do not edit!
@@ -17,9 +17,7 @@ HIGH_PNG_SOURCE=icons/high.png
HIGHEST_PNG_SOURCE=icons/highest.png
IMMEDIATE_PNG_SOURCE=icons/immediate.png
RSS_PNG_SOURCE=icons/rss.png
-MONOTORRENT_DLL_SOURCE=../../bitsharp/src/MonoTorrent/bin/Release/MonoTorrent.dll
LOWEST_PNG_SOURCE=icons/lowest.png
-MONO_NAT_DLL_SOURCE=../mono.nat/Mono.Nat/bin/Release/Mono.Nat.dll
MONSOON_DESKTOP_SOURCE=monsoon.desktop
DONOTDOWNLOAD_PNG_SOURCE=icons/donotdownload.png
NORMAL_PNG_SOURCE=icons/normal.png
@@ -42,9 +40,7 @@ HIGH_PNG_SOURCE=icons/high.png
HIGHEST_PNG_SOURCE=icons/highest.png
IMMEDIATE_PNG_SOURCE=icons/immediate.png
RSS_PNG_SOURCE=icons/rss.png
-MONOTORRENT_DLL_SOURCE=../../bitsharp/src/MonoTorrent/bin/Release/MonoTorrent.dll
LOWEST_PNG_SOURCE=icons/lowest.png
-MONO_NAT_DLL_SOURCE=../mono.nat/Mono.Nat/bin/Release/Mono.Nat.dll
MONSOON_DESKTOP_SOURCE=monsoon.desktop
DONOTDOWNLOAD_PNG_SOURCE=icons/donotdownload.png
NORMAL_PNG_SOURCE=icons/normal.png
@@ -56,11 +52,13 @@ endif
AL=al2
SATELLITE_ASSEMBLY_NAME=.resources.dll
+UNSTABLE_LIBS = ./libs/MonoTorrent.dll \
+ ./libs/Mono.Nat.dll
+
PROGRAMFILES = \
$(MONSOON_EXE_CONFIG) \
- $(MONOTORRENT_DLL) \
- $(MONO_NAT_DLL) \
- $(NLOG_DLL)
+ $(NLOG_DLL) \
+ $(UNSTABLE_LIBS)
LINUX_DESKTOPAPPLICATIONS = \
$(MONSOON_DESKTOP)
@@ -80,7 +78,16 @@ BINARIES = \
-all: $(ASSEMBLY) $(PROGRAMFILES) $(LINUX_DESKTOPAPPLICATIONS) $(PROGRAMFILES_ICONS) $(BINARIES)
+all: update-libs $(ASSEMBLY) $(PROGRAMFILES) $(LINUX_DESKTOPAPPLICATIONS) $(PROGRAMFILES_ICONS) $(BINARIES)
+
+./libs/Mono.Nat.dll: update-libs
+./libs/MonoTorrent.dll: update-libs
+
+update-libs:
+ mkdir -p ./libs
+ cp `pkg-config --variable=Libraries monotorrent` ./libs/MonoTorrent.dll
+ cp `pkg-config --variable=Libraries mono.nat` ./libs/Mono.Nat.dll
+
FILES = \
AboutDialog.cs \
@@ -178,11 +185,11 @@ REFERENCES = \
$(GLIB_SHARP_20_LIBS)
DLL_REFERENCES = \
- NLog.dll \
- ../mono.nat/Mono.Nat/bin/Release/Mono.Nat.dll \
- ../bitsharp/MonoTorrent/bin/Release/MonoTorrent.dll
+ $(NLOG_DLL) \
+ ./libs/Mono.Nat.dll \
+ ./libs/MonoTorrent.dll
-CLEANFILES = $(PROGRAMFILES) $(LINUX_DESKTOPAPPLICATIONS) $(PROGRAMFILES_ICONS) $(BINARIES)
+CLEANFILES = $(PROGRAMFILES) $(LINUX_DESKTOPAPPLICATIONS) $(PROGRAMFILES_ICONS) $(BINARIES) $(UNSTABLE_LIBS)
include $(top_srcdir)/Makefile.include
@@ -191,9 +198,7 @@ HIGH_PNG = $(BUILD_DIR)/icons/high.png
HIGHEST_PNG = $(BUILD_DIR)/icons/highest.png
IMMEDIATE_PNG = $(BUILD_DIR)/icons/immediate.png
RSS_PNG = $(BUILD_DIR)/icons/rss.png
-MONOTORRENT_DLL = $(BUILD_DIR)/MonoTorrent.dll
LOWEST_PNG = $(BUILD_DIR)/icons/lowest.png
-MONO_NAT_DLL = $(BUILD_DIR)/Mono.Nat.dll
MONSOON_DESKTOP = $(BUILD_DIR)/monsoon.desktop
DONOTDOWNLOAD_PNG = $(BUILD_DIR)/icons/donotdownload.png
MONSOON = $(BUILD_DIR)/monsoon
@@ -206,9 +211,7 @@ $(eval $(call emit-deploy-target,HIGH_PNG))
$(eval $(call emit-deploy-target,HIGHEST_PNG))
$(eval $(call emit-deploy-target,IMMEDIATE_PNG))
$(eval $(call emit-deploy-target,RSS_PNG))
-$(eval $(call emit-deploy-target,MONOTORRENT_DLL))
$(eval $(call emit-deploy-target,LOWEST_PNG))
-$(eval $(call emit-deploy-target,MONO_NAT_DLL))
$(eval $(call emit-deploy-target,MONSOON_DESKTOP))
$(eval $(call emit-deploy-target,DONOTDOWNLOAD_PNG))
$(eval $(call emit-deploy-wrapper,MONSOON,monsoon,x))
View
@@ -2,7 +2,7 @@
PROJECT=Monsoon
FILE=
-CONFIGURE=configure.in
+CONFIGURE=configure.ac
: ${AUTOCONF=autoconf}
: ${AUTOHEADER=autoheader}
@@ -1,5 +1,5 @@
AC_PREREQ([2.54])
-AC_INIT([Monsoon], [0.15])
+AC_INIT([Monsoon], [0.16])
AM_INIT_AUTOMAKE([foreign tar-pax])
dnl pkg-config
@@ -47,6 +47,8 @@ PKG_CHECK_MODULES([GCONF_SHARP_20], [gconf-sharp-2.0])
PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0 >= 2.10])
PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
PKG_CHECK_MODULES([NDESK_DBUS_GLIB_10], [ndesk-dbus-glib-1.0])
+PKG_CHECK_MODULES([MONOTORRENT], [monotorrent = 0.6])
+PKG_CHECK_MODULES([MONONAT], [mono.nat >= 1.0])
# I18N
AC_PROG_INTLTOOL([0.25])
@@ -61,20 +63,12 @@ AM_GLIB_GNU_GETTEXT
dnl package checks, per config
AC_CONFIG_FILES([
-Makefile
-Monsoon/Makefile
-Monsoon/monsoon
-bitsharp/Makefile
-bitsharp/MonoTorrent/Makefile
-bitsharp/MonoTorrent/monotorrent.pc
-
-mono.nat/Makefile
-mono.nat/Mono.Nat/Makefile
-mono.nat/Mono.Nat/mono.nat.pc
+ Makefile
+ Monsoon/AssemblyInfo.cs
+ Monsoon/Defines.cs
+ Monsoon/Makefile
+ Monsoon/monsoon
+ po/Makefile.in
])
-AC_OUTPUT([
-Monsoon/AssemblyInfo.cs
-Monsoon/Defines.cs
-po/Makefile.in
-])
+AC_OUTPUT
View
@@ -13,14 +13,16 @@ Monsoon/PiecesTreeView.cs
Monsoon/RssManager/RssFilter.cs
Monsoon/RssManager/RssManagerDialog.cs
Monsoon/TorrentContextMenu.cs
+Monsoon/TorrentController.cs
Monsoon/TorrentTreeView.cs
Monsoon/UnhandledExceptionDialog.cs
-Monsoon/gtk-gui/MainWindow.cs
+Monsoon/View/NatWidget.cs
Monsoon/gtk-gui/Monsoon.MainWindow.cs
Monsoon/gtk-gui/Monsoon.CreateTorrentProgressDialog.cs
Monsoon/gtk-gui/Monsoon.EditColumnsDialog.cs
Monsoon/gtk-gui/Monsoon.MainWindow.cs
Monsoon/gtk-gui/Monsoon.CreateTorrentDialog.cs
+Monsoon/gtk-gui/Monsoon.LoadTorrentDialog.cs
Monsoon/gtk-gui/Monsoon.PreferencesDialog.cs
Monsoon/gtk-gui/Monsoon.UnhandledExceptionDialog.cs
Monsoon/gtk-gui/Monsoon.RssManagerDialog.cs

0 comments on commit 1110d27

Please sign in to comment.