Author: everaldo
Date: 2008-02-17 17:55:43 -0500 (Sun, 17 Feb 2008)
New Revision: 96007
Modified:
trunk/release/garmono/ChangeLog
trunk/release/garmono/maemo/devkit/environment/Makefile
trunk/release/garmono/maemo/devkit/environment/files/environment
trunk/release/garmono/maemo/devkit/environment/files/target_setup.sh
trunk/release/garmono/maemo/tasks/devkit/Makefile
Log:
2008-02-16 Everaldo Canuto <[EMAIL PROTECTED]>
* maemo/tasks/devkit/Makefile: Environment vars added to devkit.
* maemo/devkit/environment/files/target_setup.sh: Environment vars
added to
devkit.
* maemo/devkit/environment/files/environment: Environment vars added to
devkit.
* maemo/devkit/environment/Makefile: Environment vars added to devkit.
Modified: trunk/release/garmono/ChangeLog
===================================================================
--- trunk/release/garmono/ChangeLog 2008-02-17 21:42:24 UTC (rev 96006)
+++ trunk/release/garmono/ChangeLog 2008-02-17 22:55:43 UTC (rev 96007)
@@ -1,3 +1,12 @@
+2008-02-16 Everaldo Canuto <[EMAIL PROTECTED]>
+
+ * maemo/tasks/devkit/Makefile: Environment vars added to devkit.
+ * maemo/devkit/environment/files/target_setup.sh: Environment vars
added to
+ devkit.
+ * maemo/devkit/environment/files/environment: Environment vars added to
+ devkit.
+ * maemo/devkit/environment/Makefile: Environment vars added to devkit.
+
2008-02-14 Everaldo Canuto <[EMAIL PROTECTED]>
* gar.conf.mk: SBOX_PREFIX added.
Modified: trunk/release/garmono/maemo/devkit/environment/Makefile
===================================================================
--- trunk/release/garmono/maemo/devkit/environment/Makefile 2008-02-17
21:42:24 UTC (rev 96006)
+++ trunk/release/garmono/maemo/devkit/environment/Makefile 2008-02-17
22:55:43 UTC (rev 96007)
@@ -2,16 +2,19 @@
CATEGORIES = maemo/devkit
GARVERSION = 0
-DESCRIPTION = environment
+DESCRIPTION = Environment vars for Mono Devkit
define BLURB
- # FIXME: blurb goes here
+ Environment vars needed by Mono Scratchbox Devkit.
endef
+GARMONO_DESTDIR = $(SBOX_PREFIX)
INSTALL_SCRIPTS = environment
include ../../../gar.mk
install-environment:
+ echo $(sysconfdir)/
+ echo "---------------------------------"
mkdir -p $(sysconfdir)
install -m 644 files/environment $(sysconfdir)/
install -m 644 files/target_setup.sh $(prefix)/
Modified: trunk/release/garmono/maemo/devkit/environment/files/environment
===================================================================
--- trunk/release/garmono/maemo/devkit/environment/files/environment
2008-02-17 21:42:24 UTC (rev 96006)
+++ trunk/release/garmono/maemo/devkit/environment/files/environment
2008-02-17 22:55:43 UTC (rev 96007)
@@ -1,32 +1,13 @@
#!/bin/bash
-export LC_ALL=C
-export TMPDIR=/var/tmp
-export MONO_GAC_PREFIX=/usr
-BASE_PKG_CONFIG_PATH=/usr/lib/pkgconfig:/scratchbox/devkits/mono/lib/pkgconfig
-if [ -n $PKG_CONFIG_PATH ]; then
- export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BASE_PKG_CONFIG_PATH
-else
- export PKG_CONFIG_PATH=$BASE_PKG_CONFIG_PATH
-fi
+DEVKIT_PREFIX=/scratchbox/devkits/mono
-ARCH=$(dpkg-architecture -t$(gcc -dumpmachine) -qDEB_HOST_ARCH 2>/dev/null)
-if [ x"$ARCH" != x ]; then
- export SBOX_DPKG_INST_ARCH=$ARCH
-else
- echo >&2 "SBOX_DPKG_INST_ARCH not set."
-fi
-
-export SBOX_DPKG_BUILDDEPS=yes
-export SBOX_READLINK_HACK=yes
-
target=$(grep ^SBOX_CPU= /targets/links/scratchbox.config | cut -d= -f2)
if [ "$target" = "arm" ]; then
export SBOX_UNAME_MACHINE=arm
- MONO_LIBRARY_PATH=/scratchbox/devkits/mono/lib/glib
- if [ -n $LD_LIBRARY_PATH ]; then
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MONO_LIBRARY_PATH
- else
- export LD_LIBRARY_PATH=$MONO_LIBRARY_PATH
- fi
fi
+
+export MONO_GAC_PREFIX=/usr
+export
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig:$DEVKIT_PREFIX/lib/pkgconfig
+export
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DEVKIT_PREFIX/lib:$DEVKIT_PREFIX/lib/glib
+
Modified: trunk/release/garmono/maemo/devkit/environment/files/target_setup.sh
===================================================================
--- trunk/release/garmono/maemo/devkit/environment/files/target_setup.sh
2008-02-17 21:42:24 UTC (rev 96006)
+++ trunk/release/garmono/maemo/devkit/environment/files/target_setup.sh
2008-02-17 22:55:43 UTC (rev 96007)
@@ -1,2 +1 @@
-# TODO:
-# Include or copy every dpkg files
+# Nothing to do right now!
Modified: trunk/release/garmono/maemo/tasks/devkit/Makefile
===================================================================
--- trunk/release/garmono/maemo/tasks/devkit/Makefile 2008-02-17 21:42:24 UTC
(rev 96006)
+++ trunk/release/garmono/maemo/tasks/devkit/Makefile 2008-02-17 22:55:43 UTC
(rev 96007)
@@ -5,7 +5,7 @@
DEPENDS = maemo/devkit/mono
DEPENDS += maemo/devkit/gtk-sharp
#DEPENDS += maemo/devkit/maemo-sharp
-#DEPENDS += maemo/devkit/environment
+DEPENDS += maemo/devkit/environment
DESCRIPTION = Mono scratchbox devkit
define BLURB
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
