Author: everaldo
Date: 2007-12-21 20:58:27 -0500 (Fri, 21 Dec 2007)
New Revision: 91802
Added:
trunk/release/garmono/deps/
trunk/release/garmono/deps/cygwin/
trunk/release/garmono/deps/cygwin/Makefile
trunk/release/garmono/deps/cygwin/glib/
trunk/release/garmono/deps/cygwin/glib/Makefile
trunk/release/garmono/deps/cygwin/glib/checksums
trunk/release/garmono/deps/cygwin/make/
trunk/release/garmono/deps/cygwin/make/Makefile
trunk/release/garmono/deps/cygwin/make/checksums
trunk/release/garmono/deps/cygwin/pkgconfig/
trunk/release/garmono/deps/cygwin/pkgconfig/Makefile
trunk/release/garmono/deps/cygwin/pkgconfig/checksums
trunk/release/garmono/deps/cygwin/zlib/
trunk/release/garmono/deps/cygwin/zlib/Makefile
trunk/release/garmono/deps/cygwin/zlib/checksums
trunk/release/garmono/gar.category.mk
trunk/release/garmono/tasks/cygwin-build/
trunk/release/garmono/tasks/cygwin-build/Makefile
Modified:
trunk/release/garmono/ChangeLog
trunk/release/garmono/Makefile
trunk/release/garmono/gar.conf.mk
trunk/release/garmono/gar.mk
trunk/release/garmono/mono/environment/Makefile
Log:
2007-12-21 Everaldo Canuto <[EMAIL PROTECTED]>
* gar.mk: Use DESTDIR as prefix for PATH, LD_LIBRARY_PATH,
PKG_CONFIG_PATH,
C_INCLUDE_PATH and ACLOCAL_PATH.
* gar.conf.mk: Back to use empty main_DESTDIR since it is used in
install
time only.
* gar.category.mk: Recreated, it is usefull for categories like deps
when we
need to build all packages from same category.
* mono/environment/Makefile: Use DESTDIR as prefix for install path.
* tasks/cygwin-build: Cygwin build added, now we can build mono for
cygwin
using 'make cygwin-build', all depenencies is checked.
* deps/cygwin: Packages for cygwin dependencies added.
Modified: trunk/release/garmono/ChangeLog
===================================================================
--- trunk/release/garmono/ChangeLog 2007-12-22 01:58:07 UTC (rev 91801)
+++ trunk/release/garmono/ChangeLog 2007-12-22 01:58:27 UTC (rev 91802)
@@ -1,3 +1,21 @@
+2007-12-21 Everaldo Canuto <[EMAIL PROTECTED]>
+
+ * gar.mk: Use DESTDIR as prefix for PATH, LD_LIBRARY_PATH,
PKG_CONFIG_PATH,
+ C_INCLUDE_PATH and ACLOCAL_PATH.
+
+ * gar.conf.mk: Back to use empty main_DESTDIR since it is used in
install
+ time only.
+
+ * gar.category.mk: Recreated, it is usefull for categories like deps
when we
+ need to build all packages from same category.
+
+ * mono/environment/Makefile: Use DESTDIR as prefix for install path.
+
+ * tasks/cygwin-build: Cygwin build added, now we can build mono for
cygwin
+ using 'make cygwin-build', all depenencies is checked.
+
+ * deps/cygwin: Packages for cygwin dependencies added.
+
2007-12-20 Everaldo Canuto <[EMAIL PROTECTED]>
* gar.mk: Fixed xtermset error messages on cygwin when you don't have
Modified: trunk/release/garmono/Makefile
===================================================================
--- trunk/release/garmono/Makefile 2007-12-22 01:58:07 UTC (rev 91801)
+++ trunk/release/garmono/Makefile 2007-12-22 01:58:27 UTC (rev 91802)
@@ -15,7 +15,7 @@
HELPMSG = "GARMONO $(VERSION) is a utility that allows users to build Mono
from sources"
HOST_OS = $(shell uname -o)
-TGPATHS = $(shell find . -maxdepth 4 -mindepth 3 -name Makefile)
+TGPATHS = $(shell find . -maxdepth 3 -mindepth 3 -name Makefile)
TARGETS = $(sort $(subst ./,, $(subst /Makefile,, $(TGPATHS))))
PACKAGES = $(filter-out tasks/%, $(TARGETS))
TASKS = $(subst tasks/,, $(filter tasks/%, $(TARGETS)))
Added: trunk/release/garmono/deps/cygwin/Makefile
===================================================================
--- trunk/release/garmono/deps/cygwin/Makefile 2007-12-22 01:58:07 UTC (rev
91801)
+++ trunk/release/garmono/deps/cygwin/Makefile 2007-12-22 01:58:27 UTC (rev
91802)
@@ -0,0 +1 @@
+include ../../gar.category.mk
Added: trunk/release/garmono/deps/cygwin/glib/Makefile
===================================================================
--- trunk/release/garmono/deps/cygwin/glib/Makefile 2007-12-22 01:58:07 UTC
(rev 91801)
+++ trunk/release/garmono/deps/cygwin/glib/Makefile 2007-12-22 01:58:27 UTC
(rev 91802)
@@ -0,0 +1,40 @@
+GARNAME = glib
+GARVERSION = 2.12.4
+CATEGORIES = deps/cygwin
+
+DISTFILES = $(GARNAME)-$(GARVERSION).zip
+DISTFILES += $(GARNAME)-dev-$(GARVERSION).zip
+DISTFILES += gettext-0.14.5.zip
+DISTFILES += gettext-dev-0.14.5.zip
+DISTFILES += libiconv-1.9.1.bin.woe32.zip
+
+MASTER_SITES = http://ftp.gtk.org/pub/glib/2.12/win32/
+MASTER_SITES += http://ftp.gtk.org/pub/glib/2.12/win32/dependencies/
+
+DESCRIPTION = GLib low-level core library
+define BLURB
+ GLib is the low-level core library that forms the basis of GTK+ and GNOME. It
+ provides data structure handling for C, portability wrappers, and interfaces
+ for such runtime functionality as an event loop, threads, dynamic loading, and
+ an object system.
+endef
+
+INSTALL_SCRIPTS = deps
+
+# This should go before any hand-made rules.
+GARDIR ?= ../../..
+include ../../../gar.mk
+
+install-deps:
+ install -d $(DESTDIR)$(prefix)
+ cp -rf $(WORKDIR)/bin $(DESTDIR)$(prefix)
+ cp -rf $(WORKDIR)/include $(DESTDIR)$(prefix)
+ cp -rf $(WORKDIR)/lib $(DESTDIR)$(prefix)
+ cp -rf $(WORKDIR)/make $(DESTDIR)$(prefix)
+ cp -rf $(WORKDIR)/man $(DESTDIR)$(prefix)
+ cp -rf $(WORKDIR)/share $(DESTDIR)$(prefix)
+ # Don't know why but it fixes cygwin library copies, looks like cp
handle
+ # something incorrect, using install all works fine.
+ install $(WORKDIR)/bin/*.dll $(DESTDIR)$(bindir)
+ $(MAKECOOKIE)
+
Added: trunk/release/garmono/deps/cygwin/glib/checksums
===================================================================
--- trunk/release/garmono/deps/cygwin/glib/checksums 2007-12-22 01:58:07 UTC
(rev 91801)
+++ trunk/release/garmono/deps/cygwin/glib/checksums 2007-12-22 01:58:27 UTC
(rev 91802)
@@ -0,0 +1,8 @@
+93eae26d1fc07f50c41c60616b8261bb download/glib-2.12.4.zip
+606839aa663ec4b6582ee28c373ad250 download/glib-dev-2.12.4.zip
+e609b4fb01fa2c495d294de442f13847 download/gettext-0.14.5.zip
+48b7cb1ba976fcc4dbbeb6cd75a4a02d download/gettext-dev-0.14.5.zip
+a18e9420d6a354b585a77230996b4171 download/libiconv-1.9.1.bin.woe32.zip
+48d218cbeff646491b0348c44acee65f download/pkgconfig-0.15.zip
+0b431b557399c1b3948c13c803a22c95 download/zlib-1.2.3-bin.zip
+b0a2df1a2b0dd0bd801d71d06ce42360 download/zlib-1.2.3-lib.zip
Added: trunk/release/garmono/deps/cygwin/make/Makefile
===================================================================
--- trunk/release/garmono/deps/cygwin/make/Makefile 2007-12-22 01:58:07 UTC
(rev 91801)
+++ trunk/release/garmono/deps/cygwin/make/Makefile 2007-12-22 01:58:27 UTC
(rev 91802)
@@ -0,0 +1,23 @@
+GARNAME = make
+GARVERSION = 3.80-1
+CATEGORIES = deps/cygwin
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
+MASTER_SITES = http://www.go-mono.com/archive/helper/
+
+DESCRIPTION = GNU make utility to maintain groups of programs
+define BLURB
+ The purpose of the make utility is to determine automatically which pieces of
+ a large program need to be recompiled, and issue the commands to recompile
them.
+endef
+
+INSTALL_SCRIPTS = make
+
+# This should go before any hand-made rules.
+GARDIR ?= ../../..
+include ../../../gar.mk
+
+install-make:
+ install -d $(DESTDIR)$(bindir)
+ -install -m 755 $(WORKDIR)/usr/bin/make.exe $(DESTDIR)$(bindir)/make.exe
+ $(MAKECOOKIE)
+
Added: trunk/release/garmono/deps/cygwin/make/checksums
===================================================================
--- trunk/release/garmono/deps/cygwin/make/checksums 2007-12-22 01:58:07 UTC
(rev 91801)
+++ trunk/release/garmono/deps/cygwin/make/checksums 2007-12-22 01:58:27 UTC
(rev 91802)
@@ -0,0 +1 @@
+421acbc7a0605a117afb126e46d0f632 download/make-3.80-1.tar.bz2
Added: trunk/release/garmono/deps/cygwin/pkgconfig/Makefile
===================================================================
--- trunk/release/garmono/deps/cygwin/pkgconfig/Makefile 2007-12-22
01:58:07 UTC (rev 91801)
+++ trunk/release/garmono/deps/cygwin/pkgconfig/Makefile 2007-12-22
01:58:27 UTC (rev 91802)
@@ -0,0 +1,26 @@
+GARNAME = pkgconfig
+GARVERSION = 0.15
+CATEGORIES = deps/cygwin
+DISTFILES = $(GARNAME)-$(GARVERSION).zip
+MASTER_SITES = http://www.gimp.org/~tml/gimp/win32/
+
+DEPENDS += deps/cygwin/glib
+
+DESCRIPTION = The pkg-config returns metainformation about installed libraries
+define BLURB
+ The pkg-config program is used to retrieve information about installed
+ libraries in the system. It is typically used to compile and link against one
+ or more libraries.
+endef
+
+INSTALL_SCRIPTS = pkgconfig
+
+# This should go before any hand-made rules.
+GARDIR ?= ../../..
+include ../../../gar.mk
+
+install-pkgconfig:
+ install -d $(DESTDIR)$(bindir)
+ install -m 755 $(WORKDIR)/bin/pkg-config.exe
$(DESTDIR)$(bindir)/pkg-config.exe
+ $(MAKECOOKIE)
+
Added: trunk/release/garmono/deps/cygwin/pkgconfig/checksums
===================================================================
--- trunk/release/garmono/deps/cygwin/pkgconfig/checksums 2007-12-22
01:58:07 UTC (rev 91801)
+++ trunk/release/garmono/deps/cygwin/pkgconfig/checksums 2007-12-22
01:58:27 UTC (rev 91802)
@@ -0,0 +1 @@
+48d218cbeff646491b0348c44acee65f download/pkgconfig-0.15.zip
Added: trunk/release/garmono/deps/cygwin/zlib/Makefile
===================================================================
--- trunk/release/garmono/deps/cygwin/zlib/Makefile 2007-12-22 01:58:07 UTC
(rev 91801)
+++ trunk/release/garmono/deps/cygwin/zlib/Makefile 2007-12-22 01:58:27 UTC
(rev 91802)
@@ -0,0 +1,35 @@
+GARNAME = zlib
+GARVERSION = 1.2.3
+CATEGORIES = deps/cygwin
+DISTFILES = $(GARNAME)-$(GARVERSION)-bin.zip
+DISTFILES += $(GARNAME)-$(GARVERSION)-lib.zip
+MASTER_SITES = http://internap.dl.sourceforge.net/sourceforge/gnuwin32/
+
+DESCRIPTION = Compression/decompression library
+define BLURB
+ The zlib library is a general purpose data compression library.
+endef
+
+INSTALL_SCRIPTS = zlib
+
+# This should go before any hand-made rules.
+GARDIR ?= ../../..
+include ../../../gar.mk
+
+install-zlib:
+ # bin
+ install -d $(DESTDIR)$(bindir)
+ install -m 644 $(WORKDIR)/bin/zlib1.dll $(DESTDIR)$(bindir)/zlib1.dll
+ # include
+ install -d $(DESTDIR)$(includedir)
+ install -m 644 $(WORKDIR)/include/zconf.h
$(DESTDIR)$(includedir)/zconf.h
+ install -m 644 $(WORKDIR)/include/zlib.h $(DESTDIR)$(includedir)/zlib.h
+ #lib
+ install -d $(DESTDIR)$(libdir)
+ install -m 644 $(WORKDIR)/lib/libz.a $(DESTDIR)$(libdir)/libz.a
+ install -m 644 $(WORKDIR)/lib/libz.dll.a $(DESTDIR)$(libdir)/libz.dll.a
+ install -m 644 $(WORKDIR)/lib/zlib-bcc.lib
$(DESTDIR)$(libdir)/zlib-bcc.lib
+ install -m 644 $(WORKDIR)/lib/zlib.def $(DESTDIR)$(libdir)/zlib.def
+ install -m 644 $(WORKDIR)/lib/zlib.lib $(DESTDIR)$(libdir)/zlib.lib
+ $(MAKECOOKIE)
+
Added: trunk/release/garmono/deps/cygwin/zlib/checksums
===================================================================
--- trunk/release/garmono/deps/cygwin/zlib/checksums 2007-12-22 01:58:07 UTC
(rev 91801)
+++ trunk/release/garmono/deps/cygwin/zlib/checksums 2007-12-22 01:58:27 UTC
(rev 91802)
@@ -0,0 +1,2 @@
+0b431b557399c1b3948c13c803a22c95 download/zlib-1.2.3-bin.zip
+b0a2df1a2b0dd0bd801d71d06ce42360 download/zlib-1.2.3-lib.zip
Added: trunk/release/garmono/gar.category.mk
===================================================================
--- trunk/release/garmono/gar.category.mk 2007-12-22 01:58:07 UTC (rev
91801)
+++ trunk/release/garmono/gar.category.mk 2007-12-22 01:58:27 UTC (rev
91802)
@@ -0,0 +1,18 @@
+# This makefile is to be included from Makefiles in each category
+# directory.
+%:
+ @for i in $(filter-out CVS/,$(wildcard */)) ; do \
+ $(MAKE) -C $$i $* ; \
+ done
+
+paranoid-%:
+ @for i in $(filter-out CVS/,$(wildcard */)) ; do \
+ $(MAKE) -C $$i $* || exit 2; \
+ done
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+ @for i in $(filter-out CVS/,$(wildcard */)) ; do \
+ $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***"
>> $(BUILDLOG); \
+ done
Modified: trunk/release/garmono/gar.conf.mk
===================================================================
--- trunk/release/garmono/gar.conf.mk 2007-12-22 01:58:07 UTC (rev 91801)
+++ trunk/release/garmono/gar.conf.mk 2007-12-22 01:58:27 UTC (rev 91802)
@@ -62,7 +62,7 @@
# the DESTDIR is used at INSTALL TIME ONLY to determine what the
# filesystem root should be. Each different DESTIMG has its own
# DESTDIR.
-main_DESTDIR ?= $(GARMONO_DESTDIR)
+main_DESTDIR ?=
# Default main_CC to gcc, $(DESTIMG)_CC to main_CC and set CC based on
$(DESTIMG)
main_CC ?= gcc
Modified: trunk/release/garmono/gar.mk
===================================================================
--- trunk/release/garmono/gar.mk 2007-12-22 01:58:07 UTC (rev 91801)
+++ trunk/release/garmono/gar.mk 2007-12-22 01:58:27 UTC (rev 91802)
@@ -159,11 +159,11 @@
ROOTFROMDEST = $(call DIRSTODOTS,$(DESTDIR))
# Allow us to use programs we just built
-PATH := $(bindir):$(sbindir):$(PATH)
-LD_LIBRARY_PATH := $(libdir):/lib:/usr/lib:/usr/local/lib
-PKG_CONFIG_PATH :=
$(libdir)/pkgconfig/:/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:/opt/gnome/lib/pkgconfig
-C_INCLUDE_PATH := $(DESTDIR)/include:/opt/gnome/include
-ACLOCAL_PATH := $(DESTDIR)/share/aclocal
+PATH := $(DESTDIR)$(bindir):$(DESTDIR)$(sbindir):$(PATH)
+LD_LIBRARY_PATH := $(DESTDIR)$(libdir):/lib:/usr/lib:/usr/local/lib
+PKG_CONFIG_PATH :=
$(DESTDIR)$(libdir)/pkgconfig/:/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:/opt/gnome/lib/pkgconfig
+C_INCLUDE_PATH := $(DESTDIR)/$(includedir):/opt/gnome/include
+ACLOCAL_PATH := $(DESTDIR)$(datadir)/aclocal
# or at least it did before we had DESTDIR and fully-munged
# builddeps. The following may be more of a hindrance than a
Modified: trunk/release/garmono/mono/environment/Makefile
===================================================================
--- trunk/release/garmono/mono/environment/Makefile 2007-12-22 01:58:07 UTC
(rev 91801)
+++ trunk/release/garmono/mono/environment/Makefile 2007-12-22 01:58:27 UTC
(rev 91802)
@@ -19,7 +19,7 @@
$(MAKECOOKIE)
install-environment:
- install -d $(bindir)
- install -m 755 $(WORKSRC)/monoenv $(bindir)/
+ install -d $(DESTDIR)$(bindir)
+ install -m 755 $(WORKSRC)/monoenv $(DESTDIR)$(bindir)/
$(MAKECOOKIE)
Added: trunk/release/garmono/tasks/cygwin-build/Makefile
===================================================================
--- trunk/release/garmono/tasks/cygwin-build/Makefile 2007-12-22 01:58:07 UTC
(rev 91801)
+++ trunk/release/garmono/tasks/cygwin-build/Makefile 2007-12-22 01:58:27 UTC
(rev 91802)
@@ -0,0 +1,41 @@
+# Notes:
+#
+# * Try to use makefile from :
+# http://www.go-mono.com/archive/helper/make-3.80-1.tar.bz2
+#
+# * Try to install all mono dependencies.
+#
+# * If possible show detect and show possible problems like wrong cygwin
+# package version.
+#
+# The list of dependencies for cygwin can be founded here:
+#
+# http://anonsvn.mono-project.com/source/trunk/release/packaging/defs/mono
+#
+# And for gtk-sharp, here:
+#
+#
http://anonsvn.mono-project.com/source/trunk/release/packaging/defs/gtk-sharp
+#
+# The idea is to download this packages and use it.
+#
+
+GARNAME = cygwin-build
+GARVERSION = $(GARMONO_VERSION)
+CATEGORIES = meta
+
+DEPENDS = deps/cygwin/make
+DEPENDS += deps/cygwin/glib
+DEPENDS += deps/cygwin/pkgconfig
+DEPENDS += deps/cygwin/zlib
+DEPENDS += mono/environment
+DEPENDS += mono/mono
+
+DESCRIPTION = Mono Cygwin build meta package
+define BLURB
+ This meta package build and install mono environment for cygwin, all library
+ dependecies is also instaled.
+endef
+
+# This should go before any hand-made rules.
+include ../../gar.mk
+
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
