Tue, 17 Jan 2006 05:48:51 +0000
[gaim-migrate @ 15262]
Make UPnP truly asynchronous.
There are probably still a couple socket calls that should be made nonblocking, but I wanted to commit this before it became even bigger. This contains a number of probable leak fixes in the upnp stuff.
The UPnP stuff has been updated to use gaim_url_fetch_request() instead of the specific implementation.
To make this all work, I had to make gaim_network_listen() and gaim_network_listen_range() also asynchronous - seems to work just fine apart from the UPnP calls seeming to take longer than they should (I'm planning to look into this).
I also triggered a STUN and UPnP discovery on startup so that we hopefully have the information when we need it.
| 3630 | 1 | # Makefile.mingw |
| 8615 | 2 | # |
| 3630 | 3 | # Author: hermanator12002@yahoo.com |
| 4 | # Date 9/11/02 | |
| 5 | # Description: Top Makefile for win32 (mingw) port of Gaim | |
| 6 | # | |
| 7 | ||
| 8 | GAIM_SRC = ./src | |
| 9 | GAIM_PROTOS = $(GAIM_SRC)/protocols | |
| 10 | GAIM_PLUGINS = ./plugins | |
| 11 | GAIM_PIXMAPS = ./pixmaps | |
|
4017
7b9a0363ee78
[gaim-migrate @ 4217]
Herman Bloggs <herman@bluedigits.com>
parents:
3967
diff
changeset
|
12 | GAIM_SOUNDS = ./sounds |
| 3630 | 13 | GAIM_INSTALL_DIR = ./win32-install-dir |
|
9565
c824ac72974f
[gaim-migrate @ 10404]
Herman Bloggs <herman@bluedigits.com>
parents:
8675
diff
changeset
|
14 | GTKSPELL_TOP = ../win32-dev/gtkspell-2.0.6/gtkspell |
|
4537
68a8e4e73372
[gaim-migrate @ 4816]
Herman Bloggs <herman@bluedigits.com>
parents:
4373
diff
changeset
|
15 | IDLETRACK_TOP = $(GAIM_SRC)/win32/IdleTracker |
|
3920
8edcd8f6d5c1
[gaim-migrate @ 4085]
Herman Bloggs <herman@bluedigits.com>
parents:
3905
diff
changeset
|
16 | GTKRC_TOP = ../win32-dev/gtkrc |
| 3630 | 17 | OSCAR = $(GAIM_PROTOS)/oscar |
| 18 | YAHOO = $(GAIM_PROTOS)/yahoo | |
| 19 | MSN = $(GAIM_PROTOS)/msn | |
| 20 | TOC = $(GAIM_PROTOS)/toc | |
| 21 | IRC = $(GAIM_PROTOS)/irc | |
| 22 | JABBER = $(GAIM_PROTOS)/jabber | |
| 23 | NAPSTER = $(GAIM_PROTOS)/napster | |
| 24 | GG = $(GAIM_PROTOS)/gg | |
| 8675 | 25 | NOVELL = $(GAIM_PROTOS)/novell |
|
10201
6fd2263c79cc
[gaim-migrate @ 11319]
Herman Bloggs <herman@bluedigits.com>
parents:
10185
diff
changeset
|
26 | SILC = $(GAIM_PROTOS)/silc |
|
11578
70230c5dded2
[gaim-migrate @ 13847]
Daniel Atallah <datallah@pidgin.im>
parents:
11090
diff
changeset
|
27 | SIMPLE = $(GAIM_PROTOS)/simple |
| 11090 | 28 | SAMETIME = $(GAIM_PROTOS)/sametime |
| 3630 | 29 | PO = ./po |
| 30 | ||
|
10804
e51729c86312
[gaim-migrate @ 12452]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10201
diff
changeset
|
31 | MAKENSIS := makensis.exe |
|
e51729c86312
[gaim-migrate @ 12452]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10201
diff
changeset
|
32 | |
|
3967
924ce70b36fd
[gaim-migrate @ 4151]
Herman Bloggs <herman@bluedigits.com>
parents:
3963
diff
changeset
|
33 | VERSION := $(shell cat ./VERSION) |
|
924ce70b36fd
[gaim-migrate @ 4151]
Herman Bloggs <herman@bluedigits.com>
parents:
3963
diff
changeset
|
34 | |
|
6816
b14a3043ed09
[gaim-migrate @ 7356]
Herman Bloggs <herman@bluedigits.com>
parents:
6795
diff
changeset
|
35 | NEEDED_DLLS = $(GTKSPELL_TOP)/libgtkspell.dll \ |
|
7056
ce7ac622e415
[gaim-migrate @ 7619]
Herman Bloggs <herman@bluedigits.com>
parents:
6816
diff
changeset
|
36 | $(IDLETRACK_TOP)/idletrack.dll |
| 3630 | 37 | |
|
10201
6fd2263c79cc
[gaim-migrate @ 11319]
Herman Bloggs <herman@bluedigits.com>
parents:
10185
diff
changeset
|
38 | SOUNDS = $(GAIM_SOUNDS)/alert.wav \ |
|
10185
0ef4ca1f94db
[gaim-migrate @ 11300]
Mark Doliner <markdoliner@pidgin.im>
parents:
9570
diff
changeset
|
39 | $(GAIM_SOUNDS)/login.wav \ |
|
0ef4ca1f94db
[gaim-migrate @ 11300]
Mark Doliner <markdoliner@pidgin.im>
parents:
9570
diff
changeset
|
40 | $(GAIM_SOUNDS)/logout.wav \ |
|
4017
7b9a0363ee78
[gaim-migrate @ 4217]
Herman Bloggs <herman@bluedigits.com>
parents:
3967
diff
changeset
|
41 | $(GAIM_SOUNDS)/receive.wav \ |
|
10185
0ef4ca1f94db
[gaim-migrate @ 11300]
Mark Doliner <markdoliner@pidgin.im>
parents:
9570
diff
changeset
|
42 | $(GAIM_SOUNDS)/send.wav |
|
4017
7b9a0363ee78
[gaim-migrate @ 4217]
Herman Bloggs <herman@bluedigits.com>
parents:
3967
diff
changeset
|
43 | |
| 3630 | 44 | |
| 45 | ## | |
| 8615 | 46 | ## Don't forget to change STATIC_PROTO_INIT, in config.h.mingw if you |
| 3630 | 47 | ## change the status of a protocol (static/plugin) |
| 48 | ## | |
| 49 | ||
| 50 | OSCAR_TYPE = PLUGIN | |
| 51 | YAHOO_TYPE = PLUGIN | |
| 52 | MSN_TYPE = PLUGIN | |
| 53 | TOC_TYPE = PLUGIN | |
| 54 | IRC_TYPE = PLUGIN | |
| 55 | JABBER_TYPE = PLUGIN | |
| 56 | NAPSTER_TYPE = PLUGIN | |
| 57 | GG_TYPE = PLUGIN | |
| 8675 | 58 | NOVELL_TYPE = PLUGIN |
|
10201
6fd2263c79cc
[gaim-migrate @ 11319]
Herman Bloggs <herman@bluedigits.com>
parents:
10185
diff
changeset
|
59 | SILC_TYPE = PLUGIN |
|
11578
70230c5dded2
[gaim-migrate @ 13847]
Daniel Atallah <datallah@pidgin.im>
parents:
11090
diff
changeset
|
60 | SIMPLE_TYPE = PLUGIN |
| 11090 | 61 | SAMETIME_TYPE = PLUGIN |
| 3630 | 62 | |
| 63 | all: | |
| 64 | cp config.h.mingw config.h | |
| 65 | $(MAKE) TYPE='$(OSCAR_TYPE)' -C $(OSCAR) -f Makefile.mingw | |
| 66 | $(MAKE) TYPE='$(YAHOO_TYPE)' -C $(YAHOO) -f Makefile.mingw | |
| 67 | $(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f Makefile.mingw | |
| 68 | $(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f Makefile.mingw | |
| 69 | $(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f Makefile.mingw | |
|
9570
8b3f38824cd3
[gaim-migrate @ 10413]
Herman Bloggs <herman@bluedigits.com>
parents:
9565
diff
changeset
|
70 | $(MAKE) TYPE='$(NAPSTER_TYPE)' -C $(NAPSTER) -f Makefile.mingw |
| 3630 | 71 | $(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw |
| 8675 | 72 | $(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw |
|
10201
6fd2263c79cc
[gaim-migrate @ 11319]
Herman Bloggs <herman@bluedigits.com>
parents:
10185
diff
changeset
|
73 | $(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw |
|
11578
70230c5dded2
[gaim-migrate @ 13847]
Daniel Atallah <datallah@pidgin.im>
parents:
11090
diff
changeset
|
74 | $(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f Makefile.mingw |
|
12707
e3c6bc93bbf2
[gaim-migrate @ 15050]
Daniel Atallah <datallah@pidgin.im>
parents:
12506
diff
changeset
|
75 | $(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw |
|
4373
fb2ae2f5edd3
[gaim-migrate @ 4639]
Herman Bloggs <herman@bluedigits.com>
parents:
4363
diff
changeset
|
76 | $(MAKE) -C $(GAIM_SRC) -f Makefile.mingw |
| 3630 | 77 | $(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw |
| 78 | ||
| 79 | ||
| 80 | install: all | |
| 81 | mkdir -p $(GAIM_INSTALL_DIR)/plugins | |
|
4017
7b9a0363ee78
[gaim-migrate @ 4217]
Herman Bloggs <herman@bluedigits.com>
parents:
3967
diff
changeset
|
82 | mkdir -p $(GAIM_INSTALL_DIR)/sounds/gaim |
|
4319
4e35a4baa2ad
[gaim-migrate @ 4574]
Herman Bloggs <herman@bluedigits.com>
parents:
4060
diff
changeset
|
83 | $(MAKE) -C $(GAIM_PIXMAPS) -f Makefile.mingw install |
| 3630 | 84 | $(MAKE) -C $(PO) -f Makefile.mingw install |
| 85 | $(MAKE) -C $(GAIM_SRC) -f Makefile.mingw install | |
| 86 | $(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw install | |
| 87 | $(MAKE) TYPE='$(OSCAR_TYPE)' -C $(OSCAR) -f Makefile.mingw install | |
| 88 | $(MAKE) TYPE='$(YAHOO_TYPE)' -C $(YAHOO) -f Makefile.mingw install | |
| 89 | $(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f Makefile.mingw install | |
| 90 | $(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f Makefile.mingw install | |
| 91 | $(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f Makefile.mingw install | |
|
9570
8b3f38824cd3
[gaim-migrate @ 10413]
Herman Bloggs <herman@bluedigits.com>
parents:
9565
diff
changeset
|
92 | $(MAKE) TYPE='$(NAPSTER_TYPE)' -C $(NAPSTER) -f Makefile.mingw install |
| 3630 | 93 | $(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw install |
| 8675 | 94 | $(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw install |
|
10201
6fd2263c79cc
[gaim-migrate @ 11319]
Herman Bloggs <herman@bluedigits.com>
parents:
10185
diff
changeset
|
95 | $(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw install |
|
11578
70230c5dded2
[gaim-migrate @ 13847]
Daniel Atallah <datallah@pidgin.im>
parents:
11090
diff
changeset
|
96 | $(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f Makefile.mingw install |
|
12707
e3c6bc93bbf2
[gaim-migrate @ 15050]
Daniel Atallah <datallah@pidgin.im>
parents:
12506
diff
changeset
|
97 | $(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f Makefile.mingw install |
| 3630 | 98 | cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR) |
|
4017
7b9a0363ee78
[gaim-migrate @ 4217]
Herman Bloggs <herman@bluedigits.com>
parents:
3967
diff
changeset
|
99 | cp $(SOUNDS) $(GAIM_INSTALL_DIR)/sounds/gaim |
| 3630 | 100 | |
| 101 | installer: | |
|
10804
e51729c86312
[gaim-migrate @ 12452]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10201
diff
changeset
|
102 | $(MAKENSIS) /DGAIM_VERSION="$(VERSION)" /DWITH_GTK gaim-installer.nsi |
|
5384
b187b49ff651
[gaim-migrate @ 5760]
Herman Bloggs <herman@bluedigits.com>
parents:
4897
diff
changeset
|
103 | |
|
b187b49ff651
[gaim-migrate @ 5760]
Herman Bloggs <herman@bluedigits.com>
parents:
4897
diff
changeset
|
104 | installer_nogtk: |
|
10804
e51729c86312
[gaim-migrate @ 12452]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10201
diff
changeset
|
105 | $(MAKENSIS) /DGAIM_VERSION="$(VERSION)" gaim-installer.nsi |
| 3630 | 106 | |
|
5931
6bd53176fdcf
[gaim-migrate @ 6371]
Herman Bloggs <herman@bluedigits.com>
parents:
5387
diff
changeset
|
107 | installer_debug: |
|
10804
e51729c86312
[gaim-migrate @ 12452]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10201
diff
changeset
|
108 | $(MAKENSIS) /DGAIM_VERSION="$(VERSION)" /DDEBUG gaim-installer.nsi |
|
5931
6bd53176fdcf
[gaim-migrate @ 6371]
Herman Bloggs <herman@bluedigits.com>
parents:
5387
diff
changeset
|
109 | |
|
5384
b187b49ff651
[gaim-migrate @ 5760]
Herman Bloggs <herman@bluedigits.com>
parents:
4897
diff
changeset
|
110 | installers: installer installer_nogtk |
|
b187b49ff651
[gaim-migrate @ 5760]
Herman Bloggs <herman@bluedigits.com>
parents:
4897
diff
changeset
|
111 | |
|
5931
6bd53176fdcf
[gaim-migrate @ 6371]
Herman Bloggs <herman@bluedigits.com>
parents:
5387
diff
changeset
|
112 | |
| 3630 | 113 | clean: |
| 114 | $(MAKE) -C $(PO) -f Makefile.mingw clean | |
| 115 | $(MAKE) -C $(OSCAR) -f Makefile.mingw clean | |
| 116 | $(MAKE) -C $(YAHOO) -f Makefile.mingw clean | |
| 117 | $(MAKE) -C $(MSN) -f Makefile.mingw clean | |
| 118 | $(MAKE) -C $(IRC) -f Makefile.mingw clean | |
| 119 | $(MAKE) -C $(JABBER) -f Makefile.mingw clean | |
|
9570
8b3f38824cd3
[gaim-migrate @ 10413]
Herman Bloggs <herman@bluedigits.com>
parents:
9565
diff
changeset
|
120 | $(MAKE) -C $(NAPSTER) -f Makefile.mingw clean |
| 3630 | 121 | $(MAKE) -C $(GG) -f Makefile.mingw clean |
| 8675 | 122 | $(MAKE) -C $(NOVELL) -f Makefile.mingw clean |
|
10201
6fd2263c79cc
[gaim-migrate @ 11319]
Herman Bloggs <herman@bluedigits.com>
parents:
10185
diff
changeset
|
123 | $(MAKE) -C $(SILC) -f Makefile.mingw clean |
|
11578
70230c5dded2
[gaim-migrate @ 13847]
Daniel Atallah <datallah@pidgin.im>
parents:
11090
diff
changeset
|
124 | $(MAKE) -C $(SIMPLE) -f Makefile.mingw clean |
| 11090 | 125 | $(MAKE) -C $(SAMETIME) -f Makefile.mingw clean |
| 3630 | 126 | $(MAKE) -C $(GAIM_SRC) -f Makefile.mingw clean |
| 127 | $(MAKE) -C $(GAIM_PLUGINS) -f Makefile.mingw clean | |
| 128 | rm -rf config.h $(GAIM_INSTALL_DIR) | |
|
3898
e9ecbb737e96
[gaim-migrate @ 4050]
Herman Bloggs <herman@bluedigits.com>
parents:
3896
diff
changeset
|
129 | rm -rf gaim*.exe |