View | Details | Raw Unified | Return to issue 117792
Collapse All | Expand All

(-)workdir/glib/glib-2.28.1-win32.patch.orig (-32 / +35 lines)
Lines 144-150 Link Here
144 
     {
 144 
     {
145 
--- misc/glib-2.28.1/gio/makefile.msc	2011-02-11 16:23:12.000000000 +0100
 145 
--- misc/glib-2.28.1/gio/makefile.msc	2011-02-11 16:23:12.000000000 +0100
146 
+++ misc/build/glib-2.28.1/gio/makefile.msc	2011-03-04 12:43:54.423706900 +0100
 146 
+++ misc/build/glib-2.28.1/gio/makefile.msc	2011-03-04 12:43:54.423706900 +0100
147 
@@ -3,9 +3,9 @@
 147 
@@ -3,28 +3,22 @@
148 
 PRJ_TOP = ..
 148 
 PRJ_TOP = ..
149 
 PACKAGE = gio
 149 
 PACKAGE = gio
150 
 PKG_VER = 2.0
 150 
 PKG_VER = 2.0
Lines 152-162 Link Here
152 
+!INCLUDE ..\build\win32\make.msc
 152 
+!INCLUDE ..\build\win32\make.msc
153
153
154 
-SUBDIRS = win32
 154 
-SUBDIRS = win32
155 
+SUBDIRS = win32 gvdb
 155 
-
156 
-sub-all:
157 
-	for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
158 
-
159 
-sub-one:
160 
-	cd $(THIS)
161 
-	nmake -nologo -f makefile.msc
162 
-	cd ..
163 
+SUBDIRS_ALL = win32.all gvdb.all
156
164
157 
 sub-all:
158 
 	for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
159 
@@ -18,13 +18,15 @@
160 
 INCLUDES = \
 165 
 INCLUDES = \
161 
 	-FImsvc_recommended_pragmas.h \
 166 
 	-FImsvc_recommended_pragmas.h \
162 
 	-I .. -I ..\glib -I ..\gmodule -I . \
 167 
 	-I .. -I ..\glib -I ..\gmodule -I . \
Lines 173-179 Link Here
173 
 appinfo_sources = \
 178 
 appinfo_sources = \
174 
 	gwin32appinfo.c gwin32appinfo.h
 179 
 	gwin32appinfo.c gwin32appinfo.h
175
180
176 
@@ -75,19 +77,50 @@
 181 
@@ -75,19 +69,50 @@
177 
 	$(NULL)
 182 
 	$(NULL)
178
183
179 
 OBJECTS = \
 184 
 OBJECTS = \
Lines 224-230 Link Here
224 
 	gemblem.obj \
 229 
 	gemblem.obj \
225 
 	gemblemedicon.obj \
 230 
 	gemblemedicon.obj \
226 
 	gfile.obj \
 231 
 	gfile.obj \
227 
@@ -112,20 +145,39 @@
 232 
@@ -112,20 +137,39 @@
228 
 	giomodule.obj \
 233 
 	giomodule.obj \
229 
 	gioscheduler.obj \
 234 
 	gioscheduler.obj \
230 
 	giostream.obj \
 235 
 	giostream.obj \
Lines 264-270 Link Here
264 
 	gsocket.obj \
 269 
 	gsocket.obj \
265 
 	gsocketaddress.obj \
 270 
 	gsocketaddress.obj \
266 
 	gsocketaddressenumerator.obj \
 271 
 	gsocketaddressenumerator.obj \
267 
@@ -135,13 +187,22 @@
 272 
@@ -135,13 +179,22 @@
268 
 	gsocketcontrolmessage.obj \
 273 
 	gsocketcontrolmessage.obj \
269 
 	gsocketlistener.obj \
 274 
 	gsocketlistener.obj \
270 
 	gsocketservice.obj \
 275 
 	gsocketservice.obj \
Lines 287-293 Link Here
287 
 	gunionvolumemonitor.obj \
 292 
 	gunionvolumemonitor.obj \
288 
 	gvfs.obj \
 293 
 	gvfs.obj \
289 
 	gvolume.obj \
 294 
 	gvolume.obj \
290 
@@ -156,11 +217,15 @@
 295 
@@ -156,11 +209,15 @@
291 
 	glocalfilemonitor.obj \
 296 
 	glocalfilemonitor.obj \
292 
 	glocaldirectorymonitor.obj \
 297 
 	glocaldirectorymonitor.obj \
293 
 	gwin32appinfo.obj \
 298 
 	gwin32appinfo.obj \
Lines 304-338 Link Here
304
309
305 
 libgio_2_0_la_LIBADD = \
 310 
 libgio_2_0_la_LIBADD = \
306 
 	$(top_builddir)/glib/libglib-2.0.la \
 311 
 	$(top_builddir)/glib/libglib-2.0.la \
307 
@@ -190,14 +255,14 @@
 312 
@@ -191,13 +248,13 @@
308
309 
 gio-marshal.h: gio-marshal.list
 313 
 gio-marshal.h: gio-marshal.list
310 
 	$(GLIB_GEN_MARSHAL) --prefix=_gio_marshal gio-marshal.list --header >> xgen-gwmh \
 314 
 	$(GLIB_GEN_MARSHAL) --prefix=_gio_marshal gio-marshal.list --header >> xgen-gwmh \
311 
-	&& copy /y xgen-gwmh gio-marshal.h \
 315 
 	&& copy /y xgen-gwmh gio-marshal.h \
312 
-	&& del xgen-gwmh xgen-gwmh~
 316 
-	&& del xgen-gwmh xgen-gwmh~
313 
+	&& $(GNUCOPY) /y xgen-gwmh gio-marshal.h \
314 
+	&& rm xgen-gwmh xgen-gwmh~
 317 
+	&& rm xgen-gwmh xgen-gwmh~
315
318
316 
 gio-marshal.c: gio-marshal.h
 319 
 gio-marshal.c: gio-marshal.h
317 
 	echo #include "gio-marshal.h" >> xgen-gwmc \
 320 
 	echo #include "gio-marshal.h" >> xgen-gwmc \
318 
 	&& $(GLIB_GEN_MARSHAL) --prefix=_gio_marshal gio-marshal.list --body >> xgen-gwmc \
 321 
 	&& $(GLIB_GEN_MARSHAL) --prefix=_gio_marshal gio-marshal.list --body >> xgen-gwmc \
319 
-	&& copy xgen-gwmc gio-marshal.c \
 322 
 	&& copy xgen-gwmc gio-marshal.c \
320 
-	&& del xgen-gwmc xgen-gwmc~
 323 
-	&& del xgen-gwmc xgen-gwmc~
321 
+	&& $(GNUCOPY) xgen-gwmc gio-marshal.c \
322 
+	&& rm xgen-gwmc xgen-gwmc~
 324 
+	&& rm xgen-gwmc xgen-gwmc~
323
325
324 
 local_sources = \
 326 
 local_sources = \
325 
 	glocaldirectorymonitor.c \
 327 
 	glocaldirectorymonitor.c \
326 
@@ -228,7 +293,7 @@
 328 
@@ -220,12 +277,14 @@
329
330 
 all : \
331 
 	$(PRJ_TOP)\config.h \
332 
-	sub-all	\
333 
+	$(SUBDIRS_ALL) \
334 
 	gio-marshal.c \
335 
 	gioenumtypes.h		\
336 
 	gioenumtypes.c		\
337 
 	libgio-$(PKG_VER)-0.dll
327
338
339 
+$(SUBDIRS_ALL):
340 
+	cmd /C "cd $* & nmake -nologo -f makefile.msc all"
328
341
329 
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
 342 
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
330 
-	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
 343 
 	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
331 
+	$(GNUCOPY) $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
 344 
@@ -245,14 +304,14 @@
332
333 
 gioenumtypes.h: $(gio_headers) gioenumtypes.h.template
334 
 	$(PERL) ..\gobject\glib-mkenums --template gioenumtypes.h.template $(gio_headers) > gioenumtypes.h
335 
@@ -245,14 +310,14 @@
336 
 RESOURCE = $(PACKAGE).res
 345 
 RESOURCE = $(PACKAGE).res
337
346
338 
 $(PACKAGE).res : $(PACKAGE).rc
 347 
 $(PACKAGE).res : $(PACKAGE).rc
Lines 451-457 Link Here
451 
 	gprimes.obj \
 460 
 	gprimes.obj \
452 
 	gprintf.obj \
 461 
 	gprintf.obj \
453 
 	gqsort.obj \
 462 
 	gqsort.obj \
454 
@@ -88,22 +89,29 @@
 463 
@@ -88,19 +89,26 @@
455 
 	gthread.obj \
 464 
 	gthread.obj \
456 
 	gthreadpool.obj \
 465 
 	gthreadpool.obj \
457 
 	gtimer.obj \
 466 
 	gtimer.obj \
Lines 479-492 Link Here
479 
-..\glibconfig.h: ..\glibconfig.h.win32
 488 
-..\glibconfig.h: ..\glibconfig.h.win32
480 
-	copy ..\glibconfig.h.win32 ..\glibconfig.h
 489 
-	copy ..\glibconfig.h.win32 ..\glibconfig.h
481 
+glibconfig.h: glibconfig.h.win32
 490 
+glibconfig.h: glibconfig.h.win32
482 
+	$(GNUCOPY) glibconfig.h.win32 glibconfig.h
 491 
+	copy glibconfig.h.win32 glibconfig.h
483
492
484 
 ..\config.h: ..\config.h.win32
 493 
 ..\config.h: ..\config.h.win32
485 
-	copy ..\config.h.win32 ..\config.h
 494 
 	copy ..\config.h.win32 ..\config.h
486 
+	$(GNUCOPY) ..\config.h.win32 ..\config.h
487
488 
 localcharset.obj : libcharset\localcharset.c
489 
 	$(CC) $(CFLAGS) -DLIBDIR=\".\" -c libcharset\localcharset.c
490 
@@ -115,7 +123,7 @@
 495 
@@ -115,7 +123,7 @@
491 
 		-DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT glib.symbols >> glib.def
 496 
 		-DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT glib.symbols >> glib.def
492
497
Lines 587-594 Link Here
587 
+
 592 
+
588
593
589 
 gmoduleconf.h: gmoduleconf.h.win32
 594 
 gmoduleconf.h: gmoduleconf.h.win32
590 
-	copy gmoduleconf.h.win32 gmoduleconf.h
 595 
 	copy gmoduleconf.h.win32 gmoduleconf.h
591 
+	$(GNUCOPY) gmoduleconf.h.win32 gmoduleconf.h
592
596
593 
 gmodule.res : gmodule.rc
 597 
 gmodule.res : gmodule.rc
594 
-	rc -DBUILDNUMBER=0 -r -fo gmodule.res gmodule.rc
 598 
-	rc -DBUILDNUMBER=0 -r -fo gmodule.res gmodule.rc
Lines 602-609 Link Here
602 
-	del gmoduleconf.h
 606 
-	del gmoduleconf.h
603 
+	rm gmoduleconf.h
 607 
+	rm gmoduleconf.h
604 
--- misc/glib-2.28.1/gobject/makefile.msc	2011-02-18 16:35:05.000000000 +0100
 608 
--- misc/glib-2.28.1/gobject/makefile.msc	2011-02-18 16:35:05.000000000 +0100
605 
+++ misc/build/glib-2.28.1/gobject/makefile.msc	2011-03-04 12:33:52.399273100 +0100
(-)- misc/glib-2.28.1/gobject/makefile.msc (-19 / +36 lines)
Lines 622-628 Link Here
622 
 	gmarshal.strings \
 624 
 	gmarshal.strings \
623 
 	gobject-query.exe \
 625 
 	gobject-query.exe \
624 
 	libgobject-2.0-0.dll	\
 626 
 	libgobject-2.0-0.dll	\
625 
@@ -24,8 +23,10 @@
 627 
@@ -24,6 +23,8 @@
626 
 	testgobject.exe
 628 
 	testgobject.exe
627
629
628 
 gobject_OBJECTS =		\
 630 
 gobject_OBJECTS =		\
Lines 631-639 Link Here
631 
 	gboxed.obj		\
 633 
 	gboxed.obj		\
632 
 	gclosure.obj		\
 634 
 	gclosure.obj		\
633 
 	genums.obj		\
 635 
 	genums.obj		\
634 
 	gobject.obj		\
 636 
@@ -47,7 +48,7 @@
635 
 	gparam.obj		\
636 
@@ -47,21 +49,18 @@
637 
 		-DG_GNUC_PRINTF=;G_GNUC_PRINTF gobject.symbols >> gobject.def
 637 
 		-DG_GNUC_PRINTF=;G_GNUC_PRINTF gobject.symbols >> gobject.def
638
638
639 
 gobject.res : gobject.rc
 639 
 gobject.res : gobject.rc
Lines 642-656 Link Here
642
642
643 
 gmarshal.h : gmarshal.list glib-genmarshal.exe
 643 
 gmarshal.h : gmarshal.list glib-genmarshal.exe
644 
 	echo #ifndef __G_MARSHAL_H__ > xgen-gmh
 644 
 	echo #ifndef __G_MARSHAL_H__ > xgen-gmh
645 
 	echo #define __G_MARSHAL_H__ >> xgen-gmh
 645 
@@ -56,12 +57,9 @@
646 
 	glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --header >> xgen-gmh
647 
 	echo #endif /* __G_MARSHAL_H__ */ >> xgen-gmh
 646 
 	echo #endif /* __G_MARSHAL_H__ */ >> xgen-gmh
648 
-	copy xgen-gmh gmarshal.h
 647 
 	copy xgen-gmh gmarshal.h
649 
-
 648
650 
-gmarshal.c: gmarshal.list gmarshal.h glib-genmarshal.exe
 649 
-gmarshal.c: gmarshal.list gmarshal.h glib-genmarshal.exe
651 
-	glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --body > gmarshal.c
 650 
-	glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --body > gmarshal.c
652 
+	$(GNUCOPY) xgen-gmh gmarshal.h
 651 
-
653
654 
 libgobject-2.0-0.dll : $(gobject_OBJECTS) gobject.def gobject.res
 652 
 libgobject-2.0-0.dll : $(gobject_OBJECTS) gobject.def gobject.res
655 
 	$(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) gobject.res \
 653 
 	$(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) gobject.res \
656 
-	..\glib\glib-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def || del $@
 654 
-	..\glib\glib-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def || del $@
Lines 658-664 Link Here
658
656
659 
 gobject-2.28s.lib : $(gobject_OBJECTS)
657 
 gobject-2.28s.lib : $(gobject_OBJECTS)
660 
 	lib /out:$@ $(gobject_OBJECTS)
 658 
 	lib /out:$@ $(gobject_OBJECTS)
661 
@@ -69,7 +68,7 @@
 659 
@@ -69,7 +67,7 @@
662 
 # link glib's static version to avoid installing
660 
 # link glib's static version to avoid installing
663 
 glib-genmarshal.exe : glib-genmarshal.c gmarshal.strings
 661 
 glib-genmarshal.exe : glib-genmarshal.c gmarshal.strings
664 
 	$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c \
 662 
 	$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c \
Lines 689-714 Link Here
689 
 	$(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) gthread.res \
 687 
 	$(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) gthread.res \
690 
--- misc/glib-2.28.1/makefile.msc	2009-04-01 01:04:20.000000000 +0200
 688 
--- misc/glib-2.28.1/makefile.msc	2009-04-01 01:04:20.000000000 +0200
691 
+++ misc/build/glib-2.28.1/makefile.msc	2011-03-04 09:11:06.663432800 +0100
 689 
+++ misc/build/glib-2.28.1/makefile.msc	2011-03-04 09:11:06.663432800 +0100
692 
@@ -1,7 +1,7 @@
 690 
@@ -1,28 +1,25 @@
693 
 ## Makefile for building the GLib dlls with Microsoft C
 691 
 ## Makefile for building the GLib dlls with Microsoft C
694 
 ## Use: nmake -f makefile.msc
 692 
 ## Use: nmake -f makefile.msc
695
693
696 
-PARTS = glib gmodule gthread gobject gio tests
 694 
-PARTS = glib gmodule gthread gobject gio tests
697 
+PARTS = "build\win32\dirent" glib gmodule gthread gobject gio tests
695 
+PARTS_ALL = "build\win32\dirent.all" glib.all gmodule.all gthread.all gobject.all gio.all tests.all
696 
+
697 
+PARTS_CLEAN = "build\win32\dirent.clean" glib.clean gmodule.clean gthread.clean gobject.clean gio.clean tests.clean
698
698
699 
 all : \
 699 
 all : \
700 
 	config.h \
 700 
 	config.h \
701 
@@ -22,7 +22,7 @@
 701 
-	glibconfig.h \
702 
 	@cd ..
 702 
-	sub-all
703 
-
704 
-sub-all:
705 
-	for %d in ($(PARTS)) do nmake -nologo -f makefile.msc sub-one THIS=%d TARGET=all
706 
+	glib/glibconfig.h \
707 
+	$(PARTS_ALL)
708
709 
-clean : sub-clean
710 
+$(PARTS_ALL):
711 
+	cmd /C "cd $* & nmake -nologo -f makefile.msc all"
712
713 
-sub-clean:
714 
-	for %d in ($(PARTS)) do nmake -nologo -f makefile.msc sub-one THIS=%d TARGET=clean
715 
+clean : $(PARTS_ALL)
716
717 
-sub-one:
718 
-	@cd $(THIS)
719 
-	@nmake -nologo -f makefile.msc $(TARGET)
720 
-	@cd ..
721 
+$(PARTS_CLEAN):
722 
+	cmd /C "cd $* & nmake -nologo -f makefile.msc clean"
703
723
704 
 config.h: config.h.win32
 724 
 config.h: config.h.win32
705 
-	copy config.h.win32 config.h
 725 
 	copy config.h.win32 config.h
706 
+	$(GNUCOPY) config.h.win32 config.h
707
726
708 
-glibconfig.h: glibconfig.h.win32
 727 
-glibconfig.h: glibconfig.h.win32
709 
-	copy glibconfig.h.win32 glibconfig.h
 728 
-	copy glibconfig.h.win32 glibconfig.h
710 
+glibconfig.h: glib/glibconfig.h.win32
 729 
+glib/glibconfig.h: glib/glibconfig.h.win32
711 
+	$(GNUCOPY) glib/glibconfig.h.win32 glib/glibconfig.h
 730 
+	copy glib/glibconfig.h.win32 glib/glibconfig.h
712 
--- misc/glib-2.28.1/tests/makefile.msc	2011-02-18 16:35:43.000000000 +0100
 731 
--- misc/glib-2.28.1/tests/makefile.msc	2011-02-18 16:35:43.000000000 +0100
713 
+++ misc/build/glib-2.28.1/tests/makefile.msc	2011-03-04 08:33:02.079762100 +0100
 732 
+++ misc/build/glib-2.28.1/tests/makefile.msc	2011-03-04 08:33:02.079762100 +0100
714 
@@ -7,7 +7,7 @@
 733 
@@ -7,7 +7,7 @@

Return to issue 117792