Author: cazfi Date: Wed Feb 10 12:53:52 2016 New Revision: 31856 URL: http://svn.gna.org/viewcvs/freeciv?rev=31856&view=rev Log: Made msys2 based Ruledit Installer to build.
See patch #6925 Modified: trunk/doc/README.msys2 trunk/win32/installer_msys2/Makefile Modified: trunk/doc/README.msys2 URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.msys2?rev=31856&r1=31855&r2=31856&view=diff ============================================================================== --- trunk/doc/README.msys2 (original) +++ trunk/doc/README.msys2 Wed Feb 10 12:53:52 2016 @@ -16,9 +16,13 @@ - With very specific configure options (see Problems) and msys2 package selection freeciv can be built. - Buildable clients are gtk3 and Qt +- Audio support cannot be built in - Both server and client launch ok -- Client cannot connect to the server -- Installers cannot be built +- Most Installers cannot be built +- Buildable Installers: + - Ruledit +- win64 support is added in theory (win64 should work equally well to + win32) but so far testing has been almost exlusively on win32 side Setup @@ -52,7 +56,10 @@ 2.1.2) Arch-specific packages needed for building freeciv +2.1.2.1) For building gtk3-client - mingw-w64-i686-gtk3 / mingw-w64-x86_64-gtk3 + +2.1.2.2) For buildind Qt-client and/or Ruledit - mingw-w64-i686-qt5 / mingw-w64-x86_64-qt5 2.2) Packaged needed for building installer package @@ -78,6 +85,7 @@ - "<gui>-installer", where <gui> is - gtk3 - qt + - "ruledit-installer" Problems ==================================== @@ -86,8 +94,11 @@ Either avoid installing libreadline-devel package to your msys2 environment at all, or configure freeciv with --without-readline -- Freeciv with Native Language Support does not build. - Use configure option --disable-nls +- Many Freeciv components do not build when Native Language Support + is enabled. Use configure option --disable-nls to build without + Native Language Support. + Notable components that do build with nls are the server and + ruledit. ==================================== Modified: trunk/win32/installer_msys2/Makefile URL: http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=31856&r1=31855&r2=31856&view=diff ============================================================================== --- trunk/win32/installer_msys2/Makefile (original) +++ trunk/win32/installer_msys2/Makefile Wed Feb 10 12:53:52 2016 @@ -62,7 +62,7 @@ # create build directory mkdir -p build-$(WINARCH)-ruledit # configure - cd build-$(WINARCH)-ruledit; ../../../configure CPPFLAGS="-D_WIN32_WINNT=0x0600" --disable-client --disable-server --disable-fcmp --disable-freeciv-manual + cd build-$(WINARCH)-ruledit; ../../../configure CPPFLAGS="-D_WIN32_WINNT=0x0600" --disable-client --disable-server --disable-fcmp --disable-freeciv-manual --with-qt5-includes=$(ARCHDIR)/include --with-qt5-libs=$(ARCHDIR)/lib # make make -C build-$(WINARCH)-ruledit make -C build-$(WINARCH)-ruledit/translations/ruledit update-po @@ -125,7 +125,6 @@ make -C build-$(WINARCH)-ruledit DESTDIR=`pwd`/install-$(WINARCH)-ruledit install # reorder directory layout mv install-$(WINARCH)-ruledit/usr/local/bin/* install-$(WINARCH)-ruledit/ - mv install-$(WINARCH)-ruledit/usr/local/etc install-$(WINARCH)-ruledit/ mv install-$(WINARCH)-ruledit/usr/local/share/freeciv install-$(WINARCH)-ruledit/data mv install-$(WINARCH)-ruledit/usr/local/share/locale install-$(WINARCH)-ruledit/share/ mv install-$(WINARCH)-ruledit/usr/local/share/doc install-$(WINARCH)-ruledit/doc @@ -274,13 +273,66 @@ cp -R /share/locale install-$(WINARCH)-$(GUI)/share/ find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv*.mo" -delete +# TODO: Clean out unnecessary ones. These are just copies of COMMON_DLLS and +# COMMON_MSYS_DLLS with most obviously unnecessary things left out. +RULEDIT_DLLS := \ + libatk-1.0-0.dll \ + libbz2-1.dll \ + libcairo-2.dll \ + libcairo-gobject-2.dll \ + libffi-6.dll \ + libfontconfig-1.dll \ + libfreetype-6.dll \ + libgcc_s_dw2-1.dll \ + libglib-2.0-0.dll \ + libgdk_pixbuf-2.0-0.dll \ + libgio-2.0-0.dll \ + libiconv-2.dll \ + libintl-8.dll \ + liblzma-5.dll \ + libpango-1.0-0.dll \ + libpangocairo-1.0-0.dll \ + libpangowin32-1.0-0.dll \ + libpixman-1-0.dll \ + libpng16-16.dll \ + libxml2-2.dll \ + zlib1.dll \ + libwinpthread-1.dll + +RULEDIT_MSYS_DLLS := \ + 2.0.dll \ + curl-4.dll \ + idn-11.dll \ + sqlite3-0.dll \ + ssl-1.0.0.dll \ + gcc_s-1.dll \ + z.dll \ + bz2-1.dll \ + crypto-1.0.0.dll \ + gssapi-3.dll \ + heimntlm-0.dll \ + krb5-26.dll \ + asn1-8.dll \ + com_err-1.dll \ + roken-18.dll \ + crypt-0.dll \ + wind-0.dll \ + hx509-5.dll \ + heimbase-1.dll \ + iconv-2.dll \ + intl-8.dll \ + ssh2-1.dll \ + lzma-5.dll + install-env-ruledit: # add DLLs - cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) install-$(WINARCH)-ruledit + cp -R $(addprefix $(DLLPATH_PREFIX), $(RULEDIT_DLLS)) install-$(WINARCH)-ruledit cp -R $(addprefix $(DLLPATH_PREFIX), $(QT_DLLS)) install-$(WINARCH)-ruledit + cp -R $(addprefix /bin/msys-, $(RULEDIT_MSYS_DLLS)) install-$(WINARCH)-ruledit + cp -R $(addprefix /bin/msys-, $(QT_MSYS_DLLS)) install-$(WINARCH)-ruledit # add additional Qt files cp -R $(ARCHDIR)/share/qt5/plugins install-$(WINARCH)-ruledit/ - cp -R /share/locale install-$(WINARCH)-ruledit/share/ + cp -R /usr/share/locale install-$(WINARCH)-ruledit/share/ find install-$(WINARCH)-ruledit/share/locale -type f -not -name "freeciv-ruledit.mo" -delete # build installer _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits