GNOME.org
 

[chronojump] Update build system to the new mono

commit 7427162958df48cc6f1b2a0d4902465731676511
Author: Windows Build <windows chronojump org>
Date:   Mon Mar 9 00:10:43 2015 +0100

    Update build system to the new mono

 win32/Makefile.am                                  |    4 +-
 win32/deploy_win32.py                              |   19 +-
 win32/deps/etc/fonts/conf.avail/10-autohint.conf   |    9 -
 .../deps/etc/fonts/conf.avail/10-no-sub-pixel.conf |    9 -
 .../etc/fonts/conf.avail/10-sub-pixel-bgr.conf     |    9 -
 .../etc/fonts/conf.avail/10-sub-pixel-rgb.conf     |    9 -
 .../etc/fonts/conf.avail/10-sub-pixel-vbgr.conf    |    9 -
 .../etc/fonts/conf.avail/10-sub-pixel-vrgb.conf    |    9 -
 win32/deps/etc/fonts/conf.avail/10-unhinted.conf   |    9 -
 .../etc/fonts/conf.avail/20-fix-globaladvance.conf |   29 -
 .../etc/fonts/conf.avail/20-lohit-gujarati.conf    |   11 -
 .../etc/fonts/conf.avail/20-unhint-small-vera.conf |   49 -
 .../deps/etc/fonts/conf.avail/30-amt-aliases.conf  |   21 -
 .../deps/etc/fonts/conf.avail/30-urw-aliases.conf  |   52 -
 win32/deps/etc/fonts/conf.avail/40-generic.conf    |   66 -
 win32/deps/etc/fonts/conf.avail/49-sansserif.conf  |   21 -
 win32/deps/etc/fonts/conf.avail/50-user.conf       |    7 -
 win32/deps/etc/fonts/conf.avail/51-local.conf      |    7 -
 win32/deps/etc/fonts/conf.avail/60-latin.conf      |   42 -
 .../etc/fonts/conf.avail/65-fonts-persian.conf     |  539 -
 win32/deps/etc/fonts/conf.avail/65-nonlatin.conf   |   38 -
 win32/deps/etc/fonts/conf.avail/69-unifont.conf    |   24 -
 win32/deps/etc/fonts/conf.avail/70-no-bitmaps.conf |   13 -
 .../deps/etc/fonts/conf.avail/70-yes-bitmaps.conf  |   13 -
 win32/deps/etc/fonts/conf.avail/80-delicious.conf  |   20 -
 win32/deps/etc/fonts/conf.avail/90-synthetic.conf  |   64 -
 win32/deps/etc/fonts/conf.avail/README             |   48 -
 .../etc/fonts/conf.d/20-fix-globaladvance.conf     |   29 -
 win32/deps/etc/fonts/conf.d/20-lohit-gujarati.conf |   11 -
 .../etc/fonts/conf.d/20-unhint-small-vera.conf     |   49 -
 win32/deps/etc/fonts/conf.d/30-amt-aliases.conf    |   21 -
 win32/deps/etc/fonts/conf.d/30-urw-aliases.conf    |   52 -
 win32/deps/etc/fonts/conf.d/40-generic.conf        |   66 -
 win32/deps/etc/fonts/conf.d/49-sansserif.conf      |   21 -
 win32/deps/etc/fonts/conf.d/50-user.conf           |    7 -
 win32/deps/etc/fonts/conf.d/51-local.conf          |    7 -
 win32/deps/etc/fonts/conf.d/60-latin.conf          |   42 -
 win32/deps/etc/fonts/conf.d/65-fonts-persian.conf  |  539 -
 win32/deps/etc/fonts/conf.d/65-nonlatin.conf       |   38 -
 win32/deps/etc/fonts/conf.d/69-unifont.conf        |   24 -
 win32/deps/etc/fonts/conf.d/80-delicious.conf      |   20 -
 win32/deps/etc/fonts/conf.d/90-synthetic.conf      |   64 -
 win32/deps/etc/fonts/fonts.conf                    |  400 -
 win32/deps/etc/fonts/fonts.dtd                     |  186 -
 win32/deps/etc/fonts/local.conf                    |   14 -
 win32/deps/etc/gtk-2.0/gdk-pixbuf.loaders          |  118 -
 win32/deps/etc/gtk-2.0/gtk.immodules               |    7 -
 win32/deps/etc/gtk-2.0/gtkrc                       |    8 -
 win32/deps/etc/gtk-2.0/gtkrc-2.0                   |    8 -
 win32/deps/etc/gtk-2.0/im-multipress.conf          |   23 -
 .../etc/mono/1.0/DefaultWsdlHelpGenerator.aspx     | 1820 --
 win32/deps/etc/mono/1.0/machine.config             |  243 -
 win32/deps/etc/mono/2.0/Browsers/Compat.browser    |   42 -
 .../etc/mono/2.0/DefaultWsdlHelpGenerator.aspx     | 1878 --
 win32/deps/etc/mono/2.0/machine.config             |  257 -
 win32/deps/etc/mono/2.0/settings.map               |   48 -
 win32/deps/etc/mono/2.0/web.config                 |  149 -
 win32/deps/etc/mono/browscap.ini                   |18608 --------------------
 win32/deps/etc/mono/config                         |   27 -
 win32/deps/etc/mono/mconfig/config.xml             |  396 -
 60 files changed, 12 insertions(+), 26360 deletions(-)
---
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 34f6f93..f1456d0 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -20,9 +20,9 @@ deploy:
 
 bundle: deploy
        windres logo.rc logo.o
-       MONO_PATH=dist/lib/chronojump mkbundle dist/lib/chronojump/Chronojump.exe --deps -c -o temp.c -oo 
temp.o
+       MONO_PATH=${MONO_PATH}\;dist/lib/chronojump mkbundle --config ${prefix}/etc/mono/config 
dist/lib/chronojump/Chronojump.exe --deps -c -o temp.c -oo temp.o
        ${CC} -g -o dist/bin/Chronojump.exe -Wall temp.c `pkg-config --cflags --libs mono-2`  logo.o temp.o
-       MONO_PATH=dist/lib/chronojump mkbundle dist/lib/chronojump/Chronojump_Mini.exe --nodeps -c -o temp.c 
-oo temp.o
+       MONO_PATH=${MONO_PATH}\;dist/lib/chronojump mkbundle dist/lib/chronojump/Chronojump_Mini.exe --nodeps 
-c -o temp.c -oo temp.o
        ${CC} -g -o dist/bin/Chronojump_mini.exe -Wall temp.c `pkg-config --cflags --libs mono-2`  logo.o 
temp.o
 
 installer: deploy bundle
diff --git a/win32/deploy_win32.py b/win32/deploy_win32.py
index 6a1bc40..c368751 100644
--- a/win32/deploy_win32.py
+++ b/win32/deploy_win32.py
@@ -28,12 +28,13 @@ from optparse import OptionParser
 GTK_DEPS = ['libfreetype-6.dll', 'libatk-1.0-0.dll', 'libcairo-2.dll', 'libgailutil-18.dll',
             'libgdk_pixbuf-2.0-0.dll', 'libgdk-win32-2.0-0.dll', 'libgtk-win32-2.0-0.dll',
             'libpng15-15.dll', 'libfontconfig-1.dll', 'libpango-1.0-0.dll', 'libpangoft2-1.0-0.dll',
-            'libpangocairo-1.0-0.dll', 'libpangowin32-1.0-0.dll', 'zlib1.dll',
-            'libtiff-5.dll', 'libpixman-1-0.dll', 'libglade-2.0-0.dll']
+            'libpangocairo-1.0-0.dll', 'libpangowin32-1.0-0.dll',
+            'libtiff-5.dll', 'libpixman-1-0.dll', 'libglade-2.0-0.dll',
+            'libharfbuzz-0.dll']
 
-MONO_DEPS = ['mono-2.0.dll', 'MonoPosixHelper.dll', 'pangosharpglue-2.dll', 'gtksharpglue-2.dll',
+MONO_DEPS = ['libmonosgen-2.0.dll', 'libMonoPosixHelper.dll', 'pangosharpglue-2.dll', 'gtksharpglue-2.dll',
              'glibsharpglue-2.dll', 'gdksharpglue-2.dll', 'atksharpglue-2.dll',
-             'intl.dll', 'sqlite3.dll']
+             'sqlite3.dll']
 
 MONO_LIB_DEPS = []
 
@@ -47,7 +48,7 @@ GST_EXT_DEPS = ['libFLAC-8.dll', 'liba52-0.dll',
         'libogg-0.dll', 'libmp3lame-0.dll', 'libmpeg2-0.dll', 'liborc-0.4-0.dll', 'librsvg-2-2.dll',
         'libxml2-2.dll', 'libschroedinger-1.0-0.dll', 'libsoup-2.4-1.dll', 'libtheora-0.dll',
         'libtheoradec-1.dll', 'libvorbisenc-2.dll', 'libvorbis-0.dll',
-        'libx264-125.dll', 'libexpat-1.dll', 'libgnutls-28.dll', 'libcroco-0.6-3.dll',
+        'libx264-140.dll', 'libexpat-1.dll', 'libgnutls-28.dll', 'libcroco-0.6-3.dll',
         'libtasn1-3.dll', 'libz.dll', 'libiconv-2.dll',
         'libcairo-gobject-2.dll', 'liborc-test-0.4-0.dll',
         'libgcc_s_sjlj-1.dll', 'libtheoraenc-1.dll', 'libwinpthread-1.dll']
@@ -137,7 +138,7 @@ class Deploy():
         self.lib_dir = os.path.join(self.dist_dir, 'lib')
         self.images_dir = os.path.join (self.share_dir, 'chronojump', 'images')
         self.plugins_dir = os.path.join(self.lib_dir, 'gstreamer-0.10')
-        self.mono_lib_dir = os.path.join(self.lib_dir, 'mono', '4.0')
+        self.mono_lib_dir = os.path.join(self.lib_dir, 'mono', '4.5')
 
     def create_deployment_folder(self):
         print 'Create deployment directory'
@@ -174,10 +175,10 @@ class Deploy():
         print 'Deploying Mono dependencies'
         for name in MONO_DEPS:
             shutil.copy(os.path.join(self.prefix, 'bin', name), self.bin_dir)
-        shutil.copy(os.path.join(self.prefix, 'lib', 'mono', '4.0', 'mscorlib.dll'),
+        shutil.copy(os.path.join(self.prefix, 'lib', 'mono', '4.5', 'mscorlib.dll'),
                         self.mono_lib_dir)
         for name in MONO_LIB_DEPS:
-            shutil.copy(os.path.join(self.prefix, 'lib', 'mono', '4.0', name),
+            shutil.copy(os.path.join(self.prefix, 'lib', 'mono', '4.5', name),
                         self.bin_dir)
         for name in MONO_GAC_DEPS:
             shutil.copy(os.path.join(self.prefix, 'lib', 'mono', 'gac', name,
@@ -219,7 +220,7 @@ def main():
     usage = "usage: %prog [options]"
     parser = OptionParser(usage)
     parser.add_option("-p", "--prefix", action="store",
-            dest="prefix",default="c:\\gstreamer-sdk\\0.10\\x86", type="string",
+            dest="prefix",default=os.environ["CERBERO_PREFIX"], type="string",
             help="GStreamer installation path")
     parser.add_option("-s", "--msys_path", action="store",
             dest="msys_path",default="c:\\MinGW\\msys\\1.0", type="string",
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]