GNOME.org
 

[gtk-builder-win/wip/merge] wip

commit e09d47d8ce70e6404e6e0eac31058907219dfcb6
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Wed Jul 16 20:42:52 2014 +0200

    wip

 win32/libs/11_libffi.bat => libs/11_libffi.sh      |    0
 win32/libs/12_glib.bat => libs/12_glib.sh          |    0
 ...2-do-not-rely-on-__argc-and-__argv-global.patch |    0
 {win32/libs => libs}/12_glib/revert_rand_s.patch   |    0
 .../13_pkg-config.bat => libs/13_pkg-config.sh     |    0
 .../14_gobject-introspection.sh                    |    0
 win32/libs/1_zlib.bat => libs/1_zlib.sh            |    0
 {win32/libs => libs}/1_zlib/zlib.pc                |    0
 win32/libs/21_atk.bat => libs/21_atk.sh            |    0
 {win32/libs => libs}/21_atk/export-regex.patch     |    0
 win32/libs/2_xz.bat => libs/2_xz.sh                |    0
 win32/libs/31_libpng.bat => libs/31_libpng.sh      |    0
 .../32_libfreetype.bat => libs/32_libfreetype.sh   |    0
 .../33_libfontconfig.sh                            |    0
 .../libs => libs}/33_libfontconfig/fcatomic.patch  |    0
 win32/libs/34_pixman.bat => libs/34_pixman.sh      |    0
 win32/libs/35_cairo.bat => libs/35_cairo.sh        |    0
 win32/libs/36_pango.bat => libs/36_pango.sh        |    0
 win32/libs/3_libxml2.bat => libs/3_libxml2.sh      |    0
 win32/libs/41_libjpeg.bat => libs/41_libjpeg.sh    |    0
 .../libs/42_libjasper.bat => libs/42_libjasper.sh  |    0
 .../42_libjasper/jasper-1.900.1-win32_sleep.patch  |    0
 {win32/libs => libs}/42_libjasper/libtool          |    0
 win32/libs/43_libtiff.bat => libs/43_libtiff.sh    |    0
 .../44_gdk-pixbuf.bat => libs/44_gdk-pixbuf.sh     |    0
 win32/libs/4_libxslt.bat => libs/4_libxslt.sh      |    0
 win32/libs/51_gtk3.bat => libs/51_gtk3.sh          |    0
 {win32/libs => libs}/51_gtk3/remove-def.patch      |    0
 win32/libs/52_gtk2.bat => libs/52_gtk2.sh          |    0
 .../libs => libs}/52_gtk2/modules-input-makefile   |    0
 .../53_gtksourceview3.sh                           |    0
 win32/libs/5_automake.bat => libs/5_automake.sh    |    0
 win32/libs/61_libcroco.bat => libs/61_libcroco.sh  |    0
 win32/libs/62_librsvg.bat => libs/62_librsvg.sh    |    0
 {win32/libs => libs}/62_librsvg/realpath.c         |    0
 {win32/libs => libs}/62_librsvg/rsvg-base.diff     |    0
 .../71_icon-naming-utils.sh                        |    0
 .../72_hicolor-icon-theme.sh                       |    0
 .../73_gnome-icon-theme.sh                         |    0
 .../74_gnome-icon-theme-symbolic.sh                |    0
 win32/libs/BUILD_ALL.BAT => libs/BUILD_ALL.sh      |    0
 win32/README.txt                                   |    1 -
 ...gw-get-0.6.2-mingw32-beta-20131004-1-bin.tar.xz |  Bin 266512 -> 0 bytes
 win32/z_Install/setup.bat                          |   64 ---------------
 {win32/z_Install => z_Install}/INSTRUCTIONS.txt    |    0
 {win32/z_Install => z_Install}/Tools/BZIP2.EXE     |  Bin 73728 -> 73728 bytes
 {win32/z_Install => z_Install}/Tools/GZIP.EXE      |  Bin 91648 -> 91648 bytes
 {win32/z_Install => z_Install}/Tools/TAR.EXE       |  Bin 352256 -> 352256 bytes
 {win32/z_Install => z_Install}/Tools/UNZIP.EXE     |  Bin 159744 -> 159744 bytes
 {win32/z_Install => z_Install}/Tools/WGET.EXE      |  Bin 401408 -> 401408 bytes
 {win32/z_Install => z_Install}/Tools/XZ.EXE        |  Bin 2299797 -> 2299797 bytes
 .../Tools/python3.4-config                         |    0
 z_Install/setup.bat                                |   84 ++++++++++++++++++++
 53 files changed, 84 insertions(+), 65 deletions(-)
---
diff --git a/win32/libs/11_libffi.bat b/libs/11_libffi.sh
similarity index 100%
rename from win32/libs/11_libffi.bat
rename to libs/11_libffi.sh
diff --git a/win32/libs/12_glib.bat b/libs/12_glib.sh
similarity index 100%
rename from win32/libs/12_glib.bat
rename to libs/12_glib.sh
diff --git a/win32/libs/12_glib/0001-gspawn-win32-do-not-rely-on-__argc-and-__argv-global.patch 
b/libs/12_glib/0001-gspawn-win32-do-not-rely-on-__argc-and-__argv-global.patch
similarity index 100%
rename from win32/libs/12_glib/0001-gspawn-win32-do-not-rely-on-__argc-and-__argv-global.patch
rename to libs/12_glib/0001-gspawn-win32-do-not-rely-on-__argc-and-__argv-global.patch
diff --git a/win32/libs/12_glib/revert_rand_s.patch b/libs/12_glib/revert_rand_s.patch
similarity index 100%
rename from win32/libs/12_glib/revert_rand_s.patch
rename to libs/12_glib/revert_rand_s.patch
diff --git a/win32/libs/13_pkg-config.bat b/libs/13_pkg-config.sh
similarity index 100%
rename from win32/libs/13_pkg-config.bat
rename to libs/13_pkg-config.sh
diff --git a/win32/libs/14_gobject-introspection.bat b/libs/14_gobject-introspection.sh
similarity index 100%
rename from win32/libs/14_gobject-introspection.bat
rename to libs/14_gobject-introspection.sh
diff --git a/win32/libs/1_zlib.bat b/libs/1_zlib.sh
similarity index 100%
rename from win32/libs/1_zlib.bat
rename to libs/1_zlib.sh
diff --git a/win32/libs/1_zlib/zlib.pc b/libs/1_zlib/zlib.pc
similarity index 100%
rename from win32/libs/1_zlib/zlib.pc
rename to libs/1_zlib/zlib.pc
diff --git a/win32/libs/21_atk.bat b/libs/21_atk.sh
similarity index 100%
rename from win32/libs/21_atk.bat
rename to libs/21_atk.sh
diff --git a/win32/libs/21_atk/export-regex.patch b/libs/21_atk/export-regex.patch
similarity index 100%
rename from win32/libs/21_atk/export-regex.patch
rename to libs/21_atk/export-regex.patch
diff --git a/win32/libs/2_xz.bat b/libs/2_xz.sh
similarity index 100%
rename from win32/libs/2_xz.bat
rename to libs/2_xz.sh
diff --git a/win32/libs/31_libpng.bat b/libs/31_libpng.sh
similarity index 100%
rename from win32/libs/31_libpng.bat
rename to libs/31_libpng.sh
diff --git a/win32/libs/32_libfreetype.bat b/libs/32_libfreetype.sh
similarity index 100%
rename from win32/libs/32_libfreetype.bat
rename to libs/32_libfreetype.sh
diff --git a/win32/libs/33_libfontconfig.bat b/libs/33_libfontconfig.sh
similarity index 100%
rename from win32/libs/33_libfontconfig.bat
rename to libs/33_libfontconfig.sh
diff --git a/win32/libs/33_libfontconfig/fcatomic.patch b/libs/33_libfontconfig/fcatomic.patch
similarity index 100%
rename from win32/libs/33_libfontconfig/fcatomic.patch
rename to libs/33_libfontconfig/fcatomic.patch
diff --git a/win32/libs/34_pixman.bat b/libs/34_pixman.sh
similarity index 100%
rename from win32/libs/34_pixman.bat
rename to libs/34_pixman.sh
diff --git a/win32/libs/35_cairo.bat b/libs/35_cairo.sh
similarity index 100%
rename from win32/libs/35_cairo.bat
rename to libs/35_cairo.sh
diff --git a/win32/libs/36_pango.bat b/libs/36_pango.sh
similarity index 100%
rename from win32/libs/36_pango.bat
rename to libs/36_pango.sh
diff --git a/win32/libs/3_libxml2.bat b/libs/3_libxml2.sh
similarity index 100%
rename from win32/libs/3_libxml2.bat
rename to libs/3_libxml2.sh
diff --git a/win32/libs/41_libjpeg.bat b/libs/41_libjpeg.sh
similarity index 100%
rename from win32/libs/41_libjpeg.bat
rename to libs/41_libjpeg.sh
diff --git a/win32/libs/42_libjasper.bat b/libs/42_libjasper.sh
similarity index 100%
rename from win32/libs/42_libjasper.bat
rename to libs/42_libjasper.sh
diff --git a/win32/libs/42_libjasper/jasper-1.900.1-win32_sleep.patch 
b/libs/42_libjasper/jasper-1.900.1-win32_sleep.patch
similarity index 100%
rename from win32/libs/42_libjasper/jasper-1.900.1-win32_sleep.patch
rename to libs/42_libjasper/jasper-1.900.1-win32_sleep.patch
diff --git a/win32/libs/42_libjasper/libtool b/libs/42_libjasper/libtool
similarity index 100%
rename from win32/libs/42_libjasper/libtool
rename to libs/42_libjasper/libtool
diff --git a/win32/libs/43_libtiff.bat b/libs/43_libtiff.sh
similarity index 100%
rename from win32/libs/43_libtiff.bat
rename to libs/43_libtiff.sh
diff --git a/win32/libs/44_gdk-pixbuf.bat b/libs/44_gdk-pixbuf.sh
similarity index 100%
rename from win32/libs/44_gdk-pixbuf.bat
rename to libs/44_gdk-pixbuf.sh
diff --git a/win32/libs/4_libxslt.bat b/libs/4_libxslt.sh
similarity index 100%
rename from win32/libs/4_libxslt.bat
rename to libs/4_libxslt.sh
diff --git a/win32/libs/51_gtk3.bat b/libs/51_gtk3.sh
similarity index 100%
rename from win32/libs/51_gtk3.bat
rename to libs/51_gtk3.sh
diff --git a/win32/libs/51_gtk3/remove-def.patch b/libs/51_gtk3/remove-def.patch
similarity index 100%
rename from win32/libs/51_gtk3/remove-def.patch
rename to libs/51_gtk3/remove-def.patch
diff --git a/win32/libs/52_gtk2.bat b/libs/52_gtk2.sh
similarity index 100%
rename from win32/libs/52_gtk2.bat
rename to libs/52_gtk2.sh
diff --git a/win32/libs/52_gtk2/modules-input-makefile b/libs/52_gtk2/modules-input-makefile
similarity index 100%
rename from win32/libs/52_gtk2/modules-input-makefile
rename to libs/52_gtk2/modules-input-makefile
diff --git a/win32/libs/53_gtksourceview3.bat b/libs/53_gtksourceview3.sh
similarity index 100%
rename from win32/libs/53_gtksourceview3.bat
rename to libs/53_gtksourceview3.sh
diff --git a/win32/libs/5_automake.bat b/libs/5_automake.sh
similarity index 100%
rename from win32/libs/5_automake.bat
rename to libs/5_automake.sh
diff --git a/win32/libs/61_libcroco.bat b/libs/61_libcroco.sh
similarity index 100%
rename from win32/libs/61_libcroco.bat
rename to libs/61_libcroco.sh
diff --git a/win32/libs/62_librsvg.bat b/libs/62_librsvg.sh
similarity index 100%
rename from win32/libs/62_librsvg.bat
rename to libs/62_librsvg.sh
diff --git a/win32/libs/62_librsvg/realpath.c b/libs/62_librsvg/realpath.c
similarity index 100%
rename from win32/libs/62_librsvg/realpath.c
rename to libs/62_librsvg/realpath.c
diff --git a/win32/libs/62_librsvg/rsvg-base.diff b/libs/62_librsvg/rsvg-base.diff
similarity index 100%
rename from win32/libs/62_librsvg/rsvg-base.diff
rename to libs/62_librsvg/rsvg-base.diff
diff --git a/win32/libs/71_icon-naming-utils.bat b/libs/71_icon-naming-utils.sh
similarity index 100%
rename from win32/libs/71_icon-naming-utils.bat
rename to libs/71_icon-naming-utils.sh
diff --git a/win32/libs/72_hicolor-icon-theme.bat b/libs/72_hicolor-icon-theme.sh
similarity index 100%
rename from win32/libs/72_hicolor-icon-theme.bat
rename to libs/72_hicolor-icon-theme.sh
diff --git a/win32/libs/73_gnome-icon-theme.bat b/libs/73_gnome-icon-theme.sh
similarity index 100%
rename from win32/libs/73_gnome-icon-theme.bat
rename to libs/73_gnome-icon-theme.sh
diff --git a/win32/libs/74_gnome-icon-theme-symbolic.bat b/libs/74_gnome-icon-theme-symbolic.sh
similarity index 100%
rename from win32/libs/74_gnome-icon-theme-symbolic.bat
rename to libs/74_gnome-icon-theme-symbolic.sh
diff --git a/win32/libs/BUILD_ALL.BAT b/libs/BUILD_ALL.sh
similarity index 100%
rename from win32/libs/BUILD_ALL.BAT
rename to libs/BUILD_ALL.sh
diff --git a/win32/z_Install/INSTRUCTIONS.txt b/z_Install/INSTRUCTIONS.txt
similarity index 100%
rename from win32/z_Install/INSTRUCTIONS.txt
rename to z_Install/INSTRUCTIONS.txt
diff --git a/win32/z_Install/Tools/python2.7-config b/z_Install/Tools/python3.4-config
similarity index 100%
rename from win32/z_Install/Tools/python2.7-config
rename to z_Install/Tools/python3.4-config
diff --git a/z_Install/setup.bat b/z_Install/setup.bat
new file mode 100644
index 0000000..1d59773
--- /dev/null
+++ b/z_Install/setup.bat
@@ -0,0 +1,84 @@
+rem Feel free to customize this
+set MINGWDIR=c:\mingw
+
+mkdir %MINGWDIR%
+
+cd Tools
+WGET.exe --no-check-certificate 
http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.9.0/threads-win32/seh/x86_64-4.9.0-release-win32-seh-rt_v3-rev2.7z
+
+WGET.exe --no-check-certificate 
http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/ray_linn/64bit-libraries/gettext/gettext-0.18.2.7z
+
+WGET.exe --no-check-certificate 
http://sourceforge.net/projects/mingw-w64/files/External%20binary%20packages%20%28Win64%20hosted%29/libiconv/libiconv-1.13.1-win64-20100707.zip
+
+WGET.exe --no-check-certificate 
http://sourceforge.net/projects/mingw/files/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.tar.xz
+
+mkdir cache
+xcopy x86_64-4.9.0-release-win32-seh-rt_v3-rev2.7z cache
+xcopy libiconv-1.13.1-win64-20100707.zip cache
+xcopy mingw-get-0.6.2-mingw32-beta-20131004-1-bin.tar.xz cache
+cd cache
+..\Tools\7z x -o".\" *.7z
+move /y /s /e .\mingw64\* %MINGWDIR%
+rmdir /q /s mingw64
+
+move /y /s /e .\gettext-0.18.2\* %MINGWDIR%
+rmdir /q /s gettext-0.18.2
+rem the latest version of gettext is broken, see: 
http://stackoverflow.com/questions/23637991/building-lzma-linker-errors
+del /q %MINGWDIR%\*.la
+
+unzip -o *.zip
+xcopy /e /r /h /c /y mingw64\bin\*.* %MINGWDIR%\bin
+xcopy /e /r /h /c /y mingw64\share\*.* %MINGWDIR%\share
+xcopy /e /r /h /c /y mingw64\include\*.* %MINGWDIR%\x86_64-w64-mingw32\include
+xcopy /e /r /h /c /y mingw64\lib\*.* %MINGWDIR%\x86_64-w64-mingw32\lib
+del /q %MINGWDIR%\x86_64-w64-mingw32\lib\libiconv.la
+
+..\Tools\xz -d *.xz
+for %%i in (*.tar) do ..\Tools\tar -xf %%i -C %MINGWDIR%
+del /q *.tar
+cd ..
+
+rem Install python
+WGET.exe --no-check-certificate https://www.python.org/ftp/python/3.4.1/python-3.4.1.amd64.msi
+python-3.4.1.amd64.msi
+xcopy python3.4-config c:\Python34
+xcopy python3.4-config c:\Python34\python-config
+
+rem Install all the required packages
+cd %MINGWDIR%\bin
+mingw-get.exe update
+mingw-get.exe install mingw-get
+copy ..\var\lib\mingw-get\data\defaults.xml ..\var\lib\mingw-get\data\profile.xml
+mingw-get.exe install msys-core
+mingw-get.exe install msys-base
+mingw-get.exe install msys-perl
+mingw-get.exe install msys-vim
+mingw-get.exe install msys-wget
+mingw-get.exe install msys-unzip
+mingw-get.exe install msys-libiconv
+mingw-get.exe install msys-libexpat
+mingw-get.exe install msys-expat
+
+rem Set the right exports
+set PREFIX=opt
+
+echo export PREFIX="/%PREFIX%" >> %MINGWDIR%\msys\1.0\etc\profile
+
+mkdir %MINGWDIR%\msys\1.0\%PREFIX%
+mkdir %MINGWDIR%\msys\1.0\%PREFIX%\bin
+mkdir %MINGWDIR%\msys\1.0\%PREFIX%\etc
+mkdir %MINGWDIR%\msys\1.0\%PREFIX%\include
+mkdir %MINGWDIR%\msys\1.0\%PREFIX%\lib
+mkdir %MINGWDIR%\msys\1.0\%PREFIX%\lib\pkgconfig
+mkdir %MINGWDIR%\msys\1.0\%PREFIX%\share
+
+
+echo export PATH="$PATH:/%PREFIX%/bin:/c/Python27" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export CFLAGS="-I/%PREFIX%/include" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export CPPFLAGS="-I/%PREFIX%/include" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export LDFLAGS="-L/%PREFIX%/lib" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export PKG_CONFIG_PATH="/%PREFIX%/lib/pkgconfig" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export XDG_DATA_DIRS="/%PREFIX%/share" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export ACLOCAL_FLAGS="-I /opt/share/aclocal" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export ACLOCAL_PATH="/opt/share/aclocal" >> %MINGWDIR%\msys\1.0\etc\profile
+echo export LIBRARY_PATH="/opt/lib" >> %MINGWDIR%\msys\1.0\etc\profile
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]