pidgin: e2d679db: Modify the Windows build/install setup t..

deryni at pidgin.im deryni at pidgin.im
Tue Jul 7 11:55:30 EDT 2009


-----------------------------------------------------------------
Revision: e2d679db30fb21eb0e4cbee46d153b8ecfe4a1dd
Ancestor: f3625f252a6927061929f886dbf94816f62f7d61
Author: deryni at pidgin.im
Date: 2009-07-07T15:44:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e2d679db30fb21eb0e4cbee46d153b8ecfe4a1dd

Modified files:
        Makefile.mingw libpurple/plugins/perl/common/Makefile.mingw
        libpurple/win32/global.mak libpurple/win32/targets.mak
        libpurple/win32/win32dep.c
        pidgin/plugins/perl/common/Makefile.mingw
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

Modify the Windows build/install setup to deal with the perl modules the way
the Linux build/install setup does.

This wasn't strictly necessary but does make things more nicely parallel.

-------------- next part --------------
============================================================
--- Makefile.mingw	66a88addc32448c6ec40628714e6339bd8753537
+++ Makefile.mingw	fe958a1d47db0e8feb0dabdfaa2a1556ff639683
@@ -129,7 +129,7 @@ uninstall:
 	rm -rf doc/html Doxyfile.mingw
 
 uninstall:
-	rm -rf $(PURPLE_INSTALL_PERLMOD_DIR) $(PIDGIN_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_PO_DIR) $(PIDGIN_INSTALL_DIR) $(STRIPPED_RELEASE_DIR)
+	rm -rf $(PURPLE_INSTALL_PERL_DIR) $(PIDGIN_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_PO_DIR) $(PIDGIN_INSTALL_DIR) $(STRIPPED_RELEASE_DIR)
 	rm -f ./VERSION
 
 include $(PIDGIN_COMMON_TARGETS)
============================================================
--- libpurple/plugins/perl/common/Makefile.mingw	551d0edd96bc45007307ca28564dbf722f28951a
+++ libpurple/plugins/perl/common/Makefile.mingw	fc00e34aa100760011bc7f260d46d22a80f1becb
@@ -97,9 +97,10 @@ install: all
 all: $(TARGET).dll $(AUTOSPLIT)
 
 install: all
-	rm -rf $(PURPLE_INSTALL_PERLMOD_DIR)
-	cp -R lib $(PURPLE_INSTALL_PERLMOD_DIR)
-	cp $(TARGET).dll $(PURPLE_INSTALL_PERLMOD_DIR)
+	rm -rf $(PURPLE_INSTALL_PERL_DIR)
+	mkdir -p $(PURPLE_INSTALL_PERL_DIR)
+	cp -R lib/* $(PURPLE_INSTALL_PERL_DIR)
+	cp $(TARGET).dll $(PURPLE_INSTALL_PERL_DIR)/auto/Purple
 
 $(C_FILES): $(PURPLE_CONFIG_H)
 
============================================================
--- libpurple/win32/global.mak	f63e40eb2aeb64ff7a229e0ed13a6964c5ddd57b
+++ libpurple/win32/global.mak	2f390daed2559442af622b450a3c65f098074cd3
@@ -27,10 +27,10 @@ PURPLE_INSTALL_DIR := $(PIDGIN_TREE_TOP)
 # Where we installing this stuff to?
 PIDGIN_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir
 PURPLE_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir
-PIDGIN_INSTALL_PERLMOD_DIR := $(PIDGIN_INSTALL_DIR)/perlmod
 PIDGIN_INSTALL_PLUGINS_DIR := $(PIDGIN_INSTALL_DIR)/plugins
-PURPLE_INSTALL_PERLMOD_DIR := $(PURPLE_INSTALL_DIR)/perlmod
+PIDGIN_INSTALL_PERL_DIR := $(PIDGIN_INSTALL_PLUGINS_DIR)/perl
 PURPLE_INSTALL_PLUGINS_DIR := $(PURPLE_INSTALL_DIR)/plugins
+PURPLE_INSTALL_PERL_DIR := $(PURPLE_INSTALL_PLUGINS_DIR)/perl
 PURPLE_INSTALL_PO_DIR := $(PURPLE_INSTALL_DIR)/locale
 
 # Important (enough) locations in our source code
============================================================
--- libpurple/win32/targets.mak	484bd8db9e2057374e63f6f04041969db67052e9
+++ libpurple/win32/targets.mak	d6b17764e2e574f679504dec17494cd2e6b22b05
@@ -37,7 +37,7 @@ $(PIDGIN_INSTALL_PERLMOD_DIR):
 	mkdir -p $(PIDGIN_INSTALL_DIR)
 
 $(PIDGIN_INSTALL_PERLMOD_DIR):
-	mkdir -p $(PURPLE_INSTALL_PERLMOD_DIR)
+	mkdir -p $(PIDGIN_INSTALL_PERL_DIR)
 
 $(PIDGIN_INSTALL_PLUGINS_DIR):
 	mkdir -p $(PIDGIN_INSTALL_PLUGINS_DIR)
@@ -45,3 +45,8 @@ $(PURPLE_INSTALL_PO_DIR):
 $(PURPLE_INSTALL_PO_DIR):
 	mkdir -p $(PURPLE_INSTALL_PO_DIR)
 
+#$(PURPLE_INSTALL_PLUGINS_DIR):
+#	mkdir -p $(PURPLE_INSTALL_PLUGINS_DIR)
+
+#$(PURPLE_INSTALL_PERL_DIR):
+#	mkdir -p $(PURPLE_INSTALL_PERL_DIR)
============================================================
--- libpurple/win32/win32dep.c	debce1ee7b44bb3da17f6296b8a86bde5519560c
+++ libpurple/win32/win32dep.c	23ad1bd8d7820755b945fe672e62d9351a626a78
@@ -419,8 +419,6 @@ void wpurple_init(void) {
 void wpurple_init(void) {
 	WORD wVersionRequested;
 	WSADATA wsaData;
-	const char *perlenv;
-	char *newenv;
 
 	if (!g_thread_supported())
 		g_thread_init(NULL);
@@ -444,17 +442,6 @@ void wpurple_init(void) {
 		WSACleanup();
 	}
 
-	/* Set Environmental Variables */
-	/* Tell perl where to find Purple's perl modules */
-	perlenv = g_getenv("PERL5LIB");
-	newenv = g_strdup_printf("%s%s%s" G_DIR_SEPARATOR_S "perlmod;",
-		perlenv ? perlenv : "",
-		perlenv ? ";" : "",
-		wpurple_install_dir());
-	if (!g_setenv("PERL5LIB", newenv, TRUE))
-		purple_debug_warning("wpurple", "putenv failed for PERL5LIB\n");
-	g_free(newenv);
-
 	purple_debug_info("wpurple", "wpurple_init end\n");
 }
 
============================================================
--- pidgin/plugins/perl/common/Makefile.mingw	7bc4d933fdca10f9caa97865a57624a6573ef679
+++ pidgin/plugins/perl/common/Makefile.mingw	f50ce5edf97e80925f47ad6f430b51a89259d287
@@ -86,14 +86,15 @@ all: $(TARGET).dll
 
 all: $(TARGET).dll
 
-$(PURPLE_INSTALL_PERLMOD_DIR)/Purple.pm:
+$(PURPLE_INSTALL_PERL_DIR)/Purple.pm:
 	$(MAKE) -C $(PURPLE_PERL_TOP)/common -f $(MINGW_MAKEFILE) install
 
-install: all $(PURPLE_INSTALL_PERLMOD_DIR)/Purple.pm
-	rm -f $(PIDGIN_INSTALL_PERLMOD_DIR)/$(TARGET).dll $(PIDGIN_INSTALL_PERLMOD_DIR)/Pidgin/$(TARGET).pm
-	mkdir -p $(PIDGIN_INSTALL_PERLMOD_DIR)
-	cp $(TARGET).pm $(PIDGIN_INSTALL_PERLMOD_DIR)
-	cp $(TARGET).dll $(PIDGIN_INSTALL_PERLMOD_DIR)
+install: all $(PURPLE_INSTALL_PERL_DIR)/Purple.pm
+	rm -f $(PIDGIN_INSTALL_PERL_DIR)/$(TARGET).dll $(PIDGIN_INSTALL_PERL_DIR)/auto/Pidgin/$(TARGET).pm
+	mkdir -p $(PIDGIN_INSTALL_PERL_DIR)
+	cp $(TARGET).pm $(PIDGIN_INSTALL_PERL_DIR)
+	mkdir -p $(PIDGIN_INSTALL_PERL_DIR)/auto/Pidgin
+	cp $(TARGET).dll $(PIDGIN_INSTALL_PERL_DIR)/auto/Pidgin
 
 $(C_FILES): $(PIDGIN_CONFIG_H)
 
============================================================
--- pidgin/win32/nsis/pidgin-installer.nsi	275193461e1fd75a0603c50d95f1b48de32c3e17
+++ pidgin/win32/nsis/pidgin-installer.nsi	2423737ee6d9f4466fc51749f0d6a5873b247321
@@ -726,7 +726,6 @@ Section Uninstall
     RMDir "$INSTDIR\ca-certs"
     RMDir /r "$INSTDIR\locale"
     RMDir /r "$INSTDIR\pixmaps"
-    RMDir /r "$INSTDIR\perlmod"
     Delete "$INSTDIR\plugins\autoaccept.dll"
     Delete "$INSTDIR\plugins\buddynote.dll"
     Delete "$INSTDIR\plugins\convcolors.dll"
@@ -775,6 +774,7 @@ Section Uninstall
     Delete "$INSTDIR\plugins\winprefs.dll"
     Delete "$INSTDIR\plugins\xmppconsole.dll"
     Delete "$INSTDIR\plugins\xmppdisco.dll"
+    RMDir /r "$INSTDIR\plugins\perl"
     RMDir "$INSTDIR\plugins"
     RMDir /r "$INSTDIR\sasl2"
     Delete "$INSTDIR\sounds\purple\alert.wav"


More information about the Commits mailing list