Author: fedor
Date: Mon Aug 31 01:21:24 2015
New Revision: 38960

URL: http://svn.gna.org/viewcvs/gnustep?rev=38960&view=rev
Log:
Update scripts to handle msys2 (Patch from Seong Gu Lee)

Added:
    tools/scripts/trunk/install-dependencies-msys2   (with props)
Modified:
    tools/scripts/trunk/windows-build

Added: tools/scripts/trunk/install-dependencies-msys2
URL: 
http://svn.gna.org/viewcvs/gnustep/tools/scripts/trunk/install-dependencies-msys2?rev=38960&view=auto
==============================================================================
--- tools/scripts/trunk/install-dependencies-msys2      (added)
+++ tools/scripts/trunk/install-dependencies-msys2      Mon Aug 31 01:21:24 2015
@@ -0,0 +1,39 @@
+#! /bin/sh
+echo "Install dependencies at MSYS2/MINGW32..."
+
+echo "0) Source Version Control"
+pacman -S subversion
+pacman -S git
+
+echo "1) gnustep-make"
+pacman -S tar
+pacman -S unzip
+pacman -S make 
+pacman -S autogen automake autoconf autoconf2.13 libtool mingw-w64-i686-libtool
+pacman -S mingw-w64-i686-toolchain
+pacman -S mingw-w64-i686-pkg-config
+
+echo "2) gnutep-base"
+#pacman -S mingw-w64-i686-libffi
+pacman -S mingw-w64-i686-libxml2
+pacman -S mingw-w64-i686-gnutls
+pacman -S mingw-w64-i686-libxslt
+
+echo "3) gnustep-gui"
+pacman -S mingw-w64-i686-libjpeg-turbo
+pacman -S mingw-w64-i686-libtiff
+pacman -S mingw-w64-i686-giflib
+pacman -S mingw-w64-i686-icu
+pacman -S mingw-w64-i686-libsndfile
+pacman -S mingw-w64-i686-aspell
+pacman -S mingw-w64-i686-lcms mingw-w64-i686-lcms2
+pacman -S mingw-w64-i686-sqlite3
+
+pacman -S asciidoc
+pacman -S mingw-w64-i686-windows-default-manifest 
+
+echo "4) gnustep-back"
+pacman -S mingw-w64-i686-cairo
+
+echo "Done."
+

Propchange: tools/scripts/trunk/install-dependencies-msys2
------------------------------------------------------------------------------
    svn:executable = *

Modified: tools/scripts/trunk/windows-build
URL: 
http://svn.gna.org/viewcvs/gnustep/tools/scripts/trunk/windows-build?rev=38960&r1=38959&r2=38960&view=diff
==============================================================================
--- tools/scripts/trunk/windows-build   (original)
+++ tools/scripts/trunk/windows-build   Mon Aug 31 01:21:24 2015
@@ -3,18 +3,19 @@
 echo "Building for Windows/win32/MinGW..."
 echo ""
 
-if [ -f /mingw/lib/pkgconfig/fontconfig.pc ]; then
+if [ -f /$MSYSTEM/lib/pkgconfig/fontconfig.pc ]; then
     echo "fontconfig.pc file exists..."
 else
     echo "fontconfig.pc does not exist, copying..."
-    cp ./scripts/fontconfig.pc /mingw/lib/pkgconfig
+    cp ./scripts/fontconfig.pc /${MSYSTEM,,}/lib/pkgconfig
 fi
 
-export 
PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/mingw/lib/pkgconfig:${PKG_CONFIG_PATH}
-cd make && ./configure --with-layout=gnustep --prefix=/GNUstep && make install
-cd ../base && CFLAGS+=-I/usr/local/include LDFLAGS+=-L/usr/local/lib 
./configure --with-installation-domain=SYSTEM && make 
GNUSTEP_INSTALLATION_DOMAIN=SYSTEM debug=yes install
-cd ../gui && ./configure && make GNUSTEP_INSTALLATION_DOMAIN=SYSTEM debug=yes 
install
-cd ../back && ./configure --enable-graphics=cairo && make 
GNUSTEP_INSTALLATION_DOMAIN=SYSTEM debug=yes install
+#export 
PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/${MSYSTEM,,}/lib/pkgconfig:${PKG_CONFIG_PATH}
+cd make && ./configure --with-layout=gnustep --prefix=/${MSYSTEM,,}/GNUstep 
--enable-install-ld-so-conf && make install messages=yes
+source /${MSYSTEM,,}/GNUstep/System/Library/Makefiles/GNUstep.sh
+cd ../base && CFLAGS+=-I/usr/local/include LDFLAGS+=-L/usr/local/lib 
./configure --with-installation-domain=SYSTEM --disable-libdispatch && make 
GNUSTEP_INSTALLATION_DOMAIN=SYSTEM debug=yes install -j8 messages=yes
+cd ../gui && ./configure && make GNUSTEP_INSTALLATION_DOMAIN=SYSTEM debug=yes 
install -j8 messages=yes
+cd ../back && ./configure --enable-graphics=cairo --with-name=cairo && make 
GNUSTEP_INSTALLATION_DOMAIN=SYSTEM debug=yes install -j8 messages=yes
 
 echo ""
 echo "Done."


_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs

Reply via email to