[Gaim-commits] SF.net SVN: gaim: [17868] trunk

[<dat...@us...>]

Revision: 17868
          http://svn.sourceforge.net/gaim/?rev=17868&view=rev
Author:   datallah
Date:     2006-12-01 12:02:32 -0800 (Fri, 01 Dec 2006)

Log Message:
-----------
wingaim build process no longer needs to re-build everything for the non-debug version.
`make -f Makefile.mingw installers` will now produce the "regular", "no-gtk" and "debug" installers.

Modified Paths:
--------------
    trunk/Makefile.mingw
    trunk/gaim-installer.nsi

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
   - ABOUT-NLS
aclocal.m4
autom4te.cache
compile
confdefs.h
config.cache
config.guess
config.h
config.h.in
config.h.in~
config.log
config.status
config.sub
configure
configure.2.1x
depcomp
Doxyfile
gaim.apspec
gaim.desktop
gaim.pc
gaim.service
gaim.spec
install-sh
intl
intltool-extract
intltool-extract.in
intltool-merge
intltool-merge.in
intltool-update
intltool-update.in
libtool
ltconfig
ltmain.sh
Makefile
Makefile.in
missing
mkinstalldirs
stamp-h
stamp-h1
stamp-h.in
*.swp
.temp-gettextize
win32-install-dir
gaim-*.exe
VERSION

   + ABOUT-NLS
aclocal.m4
autom4te.cache
compile
confdefs.h
config.cache
config.guess
config.h
config.h.in
config.h.in~
config.log
config.status
config.sub
configure
configure.2.1x
depcomp
Doxyfile
gaim.apspec
gaim.desktop
gaim.pc
gaim.service
gaim.spec
install-sh
intl
intltool-extract
intltool-extract.in
intltool-merge
intltool-merge.in
intltool-update
intltool-update.in
libtool
ltconfig
ltmain.sh
Makefile
Makefile.in
missing
mkinstalldirs
stamp-h
stamp-h1
stamp-h.in
*.swp
.temp-gettextize
win32-install-dir*
gaim-*.exe
VERSION


Modified: trunk/Makefile.mingw
===================================================================
--- trunk/Makefile.mingw	2006-12-01 09:47:20 UTC (rev 17867)
+++ trunk/Makefile.mingw	2006-12-01 20:02:32 UTC (rev 17868)
@@ -31,8 +31,28 @@
     exit; \
 }' VERSION)
 
-.PHONY: all install installer installer_nogtk installer_debug installers clean uninstall
+# Any *.dll or *.exe files included in win32-install-dir that we don't compile
+# should be included in this list so they don't get stripped
+NON_GAIM_DLLS = \
+	freebl3.dll \
+	libgtkspell.dll \
+	libmeanwhile-1.dll \
+	libxml2.dll \
+	nspr4.dll \
+	nss3.dll \
+	nssckbi.dll \
+	plc4.dll \
+	plds4.dll \
+	silc.dll \
+	silcclient.dll \
+	softokn3.dll \
+	ssl3.dll
 
+#build an expression for `find` to use to ignore the above files
+NON_GAIM_DLLS_FIND_EXP = $(patsubst %,-o -name %,$(NON_GAIM_DLLS))
+
+.PHONY: all install installer installer_nogtk installer_debug installers clean uninstall create_release_install_dir
+
 all: $(GAIM_CONFIG_H)
 	$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE)
 	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE)
@@ -43,16 +63,22 @@
 	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) install
 	$(MAKE) -C $(GAIM_PO_TOP) -f $(GAIM_WIN32_MAKEFILE) install
 
-installer: install
-	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DWITH_GTK gaim-installer.nsi
+create_release_install_dir: install
+	rm -rf $(GAIM_INSTALL_DIR).release
+	cp -R $(GAIM_INSTALL_DIR) $(GAIM_INSTALL_DIR).release
+	find $(GAIM_INSTALL_DIR).release \( -name '*.dll' -o -name '*.exe' \) \
+	 -not \( -false $(NON_GAIM_DLLS_FIND_EXP) \) -exec strip --strip-unneeded {} ';'
 
-installer_nogtk: install
-	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" gaim-installer.nsi
+installer: create_release_install_dir
+	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DWITH_GTK /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" gaim-installer.nsi
 
+installer_nogtk: create_release_install_dir
+	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" gaim-installer.nsi
+
 installer_debug: install
-	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DDEBUG gaim-installer.nsi
+	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG gaim-installer.nsi
 
-installers: installer installer_nogtk
+installers: installer installer_nogtk installer_debug
 
 clean:
 	$(MAKE) -C $(GAIM_PO_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
@@ -61,6 +87,6 @@
 	rm -f $(GAIM_CONFIG_H) gaim*.exe
 
 uninstall:
-	rm -rf $(GAIM_INSTALL_PERLMOD_DIR) $(GAIM_INSTALL_PLUGINS_DIR) $(GAIM_INSTALL_PO_DIR) $(GAIM_INSTALL_DIR)
+	rm -rf $(GAIM_INSTALL_PERLMOD_DIR) $(GAIM_INSTALL_PLUGINS_DIR) $(GAIM_INSTALL_PO_DIR) $(GAIM_INSTALL_DIR) $(GAIM_INSTALL_DIR).release
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/gaim-installer.nsi
===================================================================
--- trunk/gaim-installer.nsi	2006-12-01 09:47:20 UTC (rev 17867)
+++ trunk/gaim-installer.nsi	2006-12-01 20:02:32 UTC (rev 17868)
@@ -424,7 +424,7 @@
     SetOutPath "$INSTDIR"
     ; Gaim files
     SetOverwrite on
-    File /r .\win32-install-dir\*.*
+    File /r ${GAIM_INSTALL_DIR}\*.*
     !ifdef DEBUG
     File "${GAIM_INSTALLER_DEPS}\exchndl.dll"
     !endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.