DELTA 21474 108 4777
SVN  ĨÅnŊ8 * Z1 dp 0&  g6j bI ~p ^' ar *F _t] arv QB z"V Z oQ ĢSee doc/README.msys2 for building instructions.
#

#
# Make rules
#

# by default build all installers
all: gtk3-installer gtk2-installer sdl-installer qt-installer ruledit-installer

gtk3-installer:
	make GUI=gtk3 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit $(EXTRA_CONFIG)" wrap-gtk3

gtk2-installer:
	make GUI=gtk2 FCMP=gtk2 EXTRA_CONFIG="--disable-ruledit $(EXTRA_CONFIG)" wrap-gtk2

sdl-installer:
	make GUI=sdl FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit $(EXTRA_CONFIG)" wrap-sdl

qt-installer:
	make GUI=qt FCMP=qt wrap-qt

ruledit-installer:
	make wrap-ruledit

snapshot:
	cd ../.. ; ./autogen.sh --no-configure-run
	make VERSION_REVTYPE="svn" EXTRA_CONFIG="--enable-svnrev" alCPPFLAGS="-D_WIN32_WINNT=0x0600" --enable-client=$(GUI) --with-followtag="win32-S2_6" --enable-fcdb=sqlite3 --enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
	# make
	make -C build-$(GUI)
	make -C build-$(GUI)/translations/freeciv update-po
	make -C build-$(GUI)/bootstrap langstat_freeciv.txt

build-freeciv-ruledit:
	# create build directory
	mkdir -p build-ruledit
	# configure
	cd build-ruledit; ../../../configure CPPFLAGS="-D_WIN32_WINNT=0x0600" --disable-client --disable-server --disable-fcmp --disable-freeciv-manual
	# make
	make -C build-ruledit
	make -C build-ruledit/translations/ruledit update-po
	make -C build-ruledit/bootstrap langstat_ruledit.txt

build-freeciv-gtk3: build-freeciv-common

build-freeciv-gtk2: build-freeciv-common

build-freeciv-sdl: build-freeciv-common

build-freeciv-qt: build-freeciv-commonetcmv install-$(GUI)/usr/local/share/doc install-$(GUI)/doc
	mkdir -p install-$(GUI)/debuginfo
	cp build-$(GUI)/gen_headers/fc_config.h install-$(GUI)/debuginfo
	# delete unneeded files
	rm -r install-$(GUI)/usr
	# strip 'freeciv-manual' and 'freeciv-mp-<gui>p-$(FCMP).cmd freeciv-$(GUI).cmd Freeciv.url install-$(GUI)/

install-freeciv-gtk3: install-freeciv-common
install-freeciv-qt: install-freeciv-common
	# strip 'freeciv-ruledit' executable
	strip install-$(GUI)/freeciv-ruledit.exe
	cp freeciv-ruledit.cmd install-$(GUI)/

install-ruledit-dir:
	mkdir -p install-ruledit/share

install-ruledit: install-ruledit-dir
	# make install
	make -C build-ruledit DESTDIR=`pwd`/install-ruledit install
	# reorder directory layout
	mv install-ruledit/usr/local/bin/* install-ruledit/
	mv install-ruledit/usr/local/etc install-ruledit/
	mv install-ruledit/usr/local/share/freeciv install-ruledit/data
	mv install-ruledit/usr/local/share/locale install-ruledit/share/
	mv install-ruledit/usr/local/share/doc install-ruledit/doc
	mkdir -p install-ruledit/debuginfo
	cp build-ruledit/gen_headers/fc_config.h install-ruledit/debuginfo
	# delete unneeded files
	rm -r install-ruledit/usr
	# strip 'freeciv-ruledit' executable
	strip install-ruledit/freeciv-ruledit.exe
	# add start menu files
	cp freeciv-ruledit.cmd Freeciv.url install-ruledit/MagickCore-6.Q16-1.dll \
	libMagickWand-6.Q16-1.dll \
	libatk-1.0-0.dll \
	libbz2-2.dll \
	libcurl.dll \
	libcairo-2.dll \
	libcairo-gobject-2.dll \
	libeay32.dll \
	libffi-6.dll \
	libfontconfig-1.dll \
	libfreetype-6.dll \
	libgcc_s_dw2-1iconv-2.dll \
	libidn-11.dll \
	libintl-8.dll \
	liblzma-5.dll \
	libogg-0.dll \
	libpango-1.0-0.dll \
	libpangocairo-1.0-0.dll \
	libpangowin32-1.0-0.dll \
	libpixman-1-0.dll \
	libpng14-14.dll \
	libpng15-15.dll \
	libpthread-2.dll \
	libsqlite3-0.dll \
	libssl32.dll \
	libvorbis-0.dll \
	libvorbisfile-3.dll \
	libxml2-2.dll \
	pthreadGC2.dll \
	zlib1.dll

install-env-common:
	# add DLLs
	cp -R $(addprefix /bin/, $(COMMON_DLLS)) install-$(GUI)

DEFAULT_FCMP_DLLS := \
	libgdk-3-0.dll \
	libgtk-3-0.dll

install-env-default-fcmp: install-env-common
	cp -R $(addprefix /bin/, $(DEFAULT_FCMP_DLLS)) install-$(GUI)
	# add additional GTK+3 files
	mkdir -p install-$(GUI)/etc
	cp -R /etc/gtk-3.0 install-$(GUI)/etc/
	mkdir -p install-$(GUI)/lib/gtk-3.0/
	cp -R /lib/gtk-3.0/3.0.0 install-$(GUI)/lib/gtk-3.0/"freeciv*.mo" -and -not -name gtk30.mo -delete

install-env-gtk3: install-env-default-fcmp

GTK2_DLLS := \
	libgdk-win32-2.0-0.dll \
	libgtk-win32-2.0-0.dll

install-env-gtk2: install-env-common
	# add DLLs
	cp -R $(addprefix /bin/, $(GTK2_DLLS)) install-$(GUI)
	# add additional GTK+2"freeciv*.mo" -and -not -name gtk20.mo -delete

SDL_DLLS := \
	libpng12-0.dll \
	libSDL_gfx-15.dll \
	SDL_image.dll \
	SDL_ttf.dll

install-env-sdl: install-env-default-fcmp
	# add DLLs
	cp -R $(addprefix /bin/, $(SDL_DLLS)) install-$(GUI)

QT_DLLS := \
	libstdc++-6.dll \
	Qt5Core.dll \
	Qt5Gui.dll \
	Qt5Widgets.dll

install-env-qt: install-env-common
	# add DLLs
	cp -R $(addprefix /bin/, $(QT_DLLS)) install-$(GUI)
	# add additional Qt files
	cp -R /plugins install-$(GUI)/"freeciv*.mo" -delete

install-env-ruledit:
	# add DLLs
	cp -R $(addprefix /bin/, $(COMMON_DLLS)) install-ruledit
	cp -R $(addprefix /bin/, $(QT_DLLS)) install-ruledit
	# add additional Qt files
	cp -R /plugins install-ruledit/
	cp -R /share/locale install-ruledit/share/
	find install-ruledit/share/locale -type f -not -name "freeciv-ruledit.mo" -delete

# build installer
ruledit: clean-install-ruledit install-ruledit install-env-ruleditruledit-nsi.sh install-ruledit $(FREECIV_VERSION) > Freeciv-$(FREECIV_VERSION)-ruleditruledit.nsi

wrap-gtk3: build-freeciv-gtk3 installer-common

wrap-gtk2: build-freeciv-gtk2 installer-common

wrap-sdl: build-freeciv-sdl installer-common

wrap-qt: build-freeciv-qt installer-common

wrap-ruledit: build-freeciv-ruledit installer-ruledit


# cleanup

clean-build-common:
	rm -rf build-$(GUI)

clean-build-ruledit:
	rm -rf build-ruledit

clean-install-common:
	rm -rf install-$(GUI)

clean-install-ruledit:
	rm -rf install-ruledit

clean-installer-common:
	rm -f Output/Freeciv-*-$(GUI)-setup.exe
	rm -f Freeciv-*-$(GUI).nsi

clean-installer-ruledit:
	rm -f Output/Freeciv-ruledit-*-setup.exe
	rm -f Freeciv-*-ruledit.nsi

clean:
	make GUI=gtk3 clean-build-common clean-install-common clean-installer-common	make GUI=qt clean-build-common clean-install-common clean-installer-common
	make clean-build-ruledit clean-install-ruledit clean-installer-ruledit
ENDREP
DELTA 31419 0 128
SVN  ÉÉ\@ 6   w5  šo+CPPFLAGS="-D_WIN32_WINNT=0x0600"CPPFLAGS="-D_WIN32_WINNT=0x0600"ENDREP
id: fyq.5qi.r31605/6303
type: file
pred: fyq.5qi.r31419/546
count: 31
text: 31605 6187 91 9436 341961a860b9c8e7301f93834d65b6ef
cpath: /branches/S2_6/win32/installer/Makefile
copyroot: 27474 /branches/S2_6

PLAIN
K 11
Freeciv.url
V 25
file fyo.5ck.r21474/21952
K 8
Makefile
V 24
file fyq.5qi.r31605/6303
K 28
create-freeciv-gtk-qt-nsi.sh
V 24
file v92.5ua.r31374/5003
K 26
create-freeciv-gtk2-nsi.sh
V 24
file fyr.5ck.r27084/2073
K 26
create-freeciv-gtk3-nsi.sh
V 24
file v94.5ck.r27084/2531
K 24
create-freeciv-qt-nsi.sh
V 24
file 1h04.5ck.r27086/596
K 29
create-freeciv-ruledit-nsi.sh
V 24
file 21qf.5qi.r31419/751
K 25
create-freeciv-sdl-nsi.sh
V 24
file fys.5qi.r31374/5267
K 16
freeciv-gtk2.cmd
V 24
file fyt.5ck.r26997/1955
K 16
freeciv-gtk3.cmd
V 24
file v95.5ck.r26997/2252
K 19
freeciv-mp-gtk2.cmd
V 23
file fyu.5n2.r26997/697
K 19
freeciv-mp-gtk3.cmd
V 24
file fyu.5n3.r26997/1027
K 17
freeciv-mp-qt.cmd
V 24
file 1h06.5ck.r27086/425
K 14
freeciv-qt.cmd
V 24
file 1h07.5ck.r27086/776
K 19
freeciv-ruledit.cmd
V 24
file 1itv.5ck.r27378/977
K 15
freeciv-sdl.cmd
V 24
file fyv.5ck.r26997/1360
K 18
freeciv-server.cmd
V 24
file fyw.5ck.r26997/1655
END
ENDREP
id: fym.5qi.r31605/7468
type: dir
pred: fym.5qi.r31419/1938
count: 38
text: 31605 6510 945 0 7b6dda797ea11873c375177828bb127a
cpath: /branches/S2_6/win32/installer
copyroot: 27474 /branches/S2_6

id: fyq.5uc.r31605/7664
type: file
pred: fyq.5uc.r31556/3191
count: 32
text: 31605 0 6159 8854 df03574c45891f79f3f2edef5abaa799
cpath: /branches/S2_6/win32/installer_msys2/Makefile
copyroot: 31440 /branches/S2_6/win32/installer_msys2

PLAIN
K 11
Freeciv.url
V 25
file fyo.5ck.r21474/21952
K 8
Makefile
V 24
file fyq.5uc.r31605/7664
K 28
create-freeciv-gtk-qt-nsi.sh
V 24
file v92.5ua.r31374/5003
K 26
create-freeciv-gtk2-nsi.sh
V 24
file fyr.5ck.r27084/2073
K 26
create-freeciv-gtk3-nsi.sh
V 24
file v94.5ck.r27084/2531
K 24
create-freeciv-qt-nsi.sh
V 24
file 1h04.5ck.r27086/596
K 29
create-freeciv-ruledit-nsi.sh
V 24
file 21qf.5qi.r31419/751
K 25
create-freeciv-sdl-nsi.sh
V 24
file fys.5qi.r31374/5267
K 16
freeciv-gtk2.cmd
V 24
file fyt.5ck.r26997/1955
K 16
freeciv-gtk3.cmd
V 24
file v95.5ck.r26997/2252
K 19
freeciv-mp-gtk2.cmd
V 23
file fyu.5n2.r26997/697
K 19
freeciv-mp-gtk3.cmd
V 24
file fyu.5n3.r26997/1027
K 17
freeciv-mp-qt.cmd
V 24
file 1h06.5ck.r27086/425
K 14
freeciv-qt.cmd
V 24
file 1h07.5ck.r27086/776
K 19
freeciv-ruledit.cmd
V 24
file 1itv.5ck.r27378/977
K 15
freeciv-sdl.cmd
V 24
file fyv.5ck.r26997/1360
K 18
freeciv-server.cmd
V 24
file fyw.5ck.r26997/1655
END
ENDREP
id: fym.5uc.r31605/8857
type: dir
pred: fym.5uc.r31556/4381
count: 40
text: 31605 7899 945 0 32684c84cbd9a088cbbb121839d43192
cpath: /branches/S2_6/win32/installer_msys2
copyroot: 31440 /branches/S2_6/win32/installer_msys2

PLAIN
K 11
Makefile.am
V 25
file 3g1.5qi.r30326/10047
K 10
client.ico
V 23
file 2ev.5ck.r22609/426
K 13
clienticon.rc
V 22
file 3g2.0.r13125/6677
K 9
installer
V 23
dir fym.5qi.r31605/7468
K 15
installer_msys2
V 23
dir fym.5uc.r31605/8857
K 6
mp.ico
V 24
file 72x.5ck.r19955/7192
K 9
mpicon.rc
V 24
file 72y.5ck.r19955/7402
K 10
server.ico
V 22
file 2ey.5ck.r22609/95
K 13
servericon.rc
V 23
file 3g3.0.r12679/13778
END
ENDREP
id: 2eu.5qi.r31605/9508
type: dir
pred: 2eu.5qi.r31556/5029
count: 57
text: 31605 9081 414 0 fc1ed9fd01266ba8c10280fb60ddb726
props: 12365 0 48 0 b9a57a7aba6d25f821a6f26036518d8d
cpath: /branches/S2_6/win32
copyroot: 27474 /branches/S2_6

PLAIN
K 9
ABOUT-NLS
V 24
file fu.5ck.r27270/69307
K 7
AUTHORS
V 24
file 5u.5ck.r22143/14016
K 7
COPYING
V 22
file 1h.5qi.r29455/952
K 9
ChangeLog
V 26
file 6l.5qi.r31298/7507168
K 7
INSTALL
V 21
file 6.5qi.r29706/131
K 11
Makefile.am
V 23
file 59.5qi.r30174/7026
K 4
NEWS
V 24
file 6m.5ck.r25634/30702
K 6
README
V 20
file 7.0.r4421/96382
K 2
ai
V 21
dir 8.5qi.r31581/5442
K 10
autogen.sh
V 22
file 12o.5qi.r31343/77
K 9
bootstrap
V 23
dir 2p5.5qi.r31374/4550
K 6
client
V 21
dir d.5qi.r31602/4746
K 6
common
V 21
dir p.5qi.r31600/8990
K 12
configure.ac
V 25
file 149.5qi.r31537/10377
K 4
data
V 23
dir w.5qi.r31603/602264
K 12
dependencies
V 24
dir 2yu.5qi.r31411/81870
K 3
doc
V 22
dir k7.5qi.r31556/2952
K 10
fc_version
V 25
file 2lo.5qj.r31371/15472
K 11
gen_headers
V 25
dir 1hsw.5qi.r31537/10971
K 2
m4
V 24
dir 12p.5qi.r31546/25234
K 7
scripts
V 24
dir 2yo.5qi.r31425/15183
K 6
server
V 21
dir z.5qi.r31599/4721
K 5
tests
V 22
dir 2g9.5qi.r31521/645
K 5
tools
V 23
dir 4pj.5qp.r31401/2465
K 12
translations
V 26
dir t0a.5qi.r31464/4003456
K 7
utility
V 22
dir 1c.5qi.r31575/5126
K 3
vms
V 25
dir u9.5ck.r21528/1396085
K 5
win32
V 23
dir 2eu.5qi.r31605/9508
END
ENDREP
id: 3.5qi.r31605/10922
type: dir
pred: 3.5qi.r31603/603685
count: 20302
text: 31605 9747 1162 0 c15fa10c142473d736b158347a9a1779
props: 28037 14463 292 0 9e1d5de0253c723466868990c52c129f
cpath: /branches/S2_6
copyroot: 27474 /branches/S2_6

PLAIN
K 5
S1_14
V 21
dir 3.21.r18109/18803
K 4
S2_0
V 21
dir 3.10x.r21862/4178
K 4
S2_1
V 22
dir 3.59e.r20026/11014
K 4
S2_2
V 21
dir 3.5cy.r21861/5036
K 4
S2_3
V 21
dir 3.5f2.r29458/5135
K 4
S2_4
V 22
dir 3.5ii.r30401/87429
K 4
S2_5
V 21
dir 3.5kv.r31604/7732
K 4
S2_6
V 22
dir 3.5qi.r31605/10922
K 11
freeciv-web
V 22
dir 3.5bl.r13594/14918
END
ENDREP
id: 1.0.r31605/11517
type: dir
pred: 1.0.r31604/8325
count: 10658
text: 31605 11163 341 0 acf38df476c3d721284875325b6ddd68
cpath: /branches
copyroot: 0 /

PLAIN
K 8
branches
V 20
dir 1.0.r31605/11517
K 4
tags
V 19
dir 2.0.r31496/6515
K 5
trunk
V 23
dir 3.5ck.r31597/603251
K 7
website
V 20
dir 3ge.0.r31573/804
END
ENDREP
id: 0.0.r31605/11839
type: dir
pred: 0.0.r31604/8646
count: 31605
text: 31605 11672 154 0 55fa023716a8b1bb28434831cecc7642
cpath: /
copyroot: 0 /

fyq.5qi.t31604-1 modify true false /branches/S2_6/win32/installer/Makefile

fyq.5uc.t31604-1 modify true false /branches/S2_6/win32/installer_msys2/Makefile


11839 11986
