From d6e50dcf0393f3a0329db654890080e27bb4a1ea Mon Sep 17 00:00:00 2001
From: Martin Gerhardy <tlh2000@users.sourceforge.net>
Date: Thu, 17 Jun 2010 07:07:52 +0000
Subject: [PATCH] * fixed linux installer creation * fixed upload urls

---
 build/install.mk                     | 19 +++++++++++--------
 build/install_linux.mk               | 17 +++++++----------
 contrib/installer/linux/README.in    |  3 +++
 contrib/installer/linux/setup.xml.in | 14 --------------
 4 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/build/install.mk b/build/install.mk
index 984b02c86c4..ce620368240 100644
--- a/build/install.mk
+++ b/build/install.mk
@@ -15,15 +15,18 @@ mappack: maps-sync
 dataarchive: pk3
 	tar -cvp -f ufoai-$(UFOAI_VERSION)-data.tar base/*.pk3
 
-USER?=tlh2000
+USER?=tlh2000,ufoai
+PATH?=/home/frs/project/u/uf/ufoai/"UFO_AI\ 2.x"/$(VERSION)/
+UPLOADHOST?=frs.sourceforge.net
+URL=$(USER)@$(UPLOADHOST):$(PATH)
 upload-sf:
-	rsync -avP -e ssh uforadiant-$(UFORADIANT_VERSION)-macosx-$(TARGET_CPU).dmg $(USER)@frs.sourceforge.net:uploads/
-	rsync -avP -e ssh ufoai-$(UFOAI_VERSION)-macosx-$(TARGET_CPU).dmg $(USER)@frs.sourceforge.net:uploads/
-	rsync -avP -e ssh ufoai-$(UFOAI_VERSION)-source.tar.bz2 $(USER)@frs.sourceforge.net:uploads/
-	rsync -avP -e ssh ufoai-$(UFOAI_VERSION)-linux.run $(USER)@frs.sourceforge.net:uploads/
-	rsync -avP -e ssh ufoai-$(UFOAI_VERSION)-data.tar $(USER)@frs.sourceforge.net:uploads/
-	rsync -avP -e ssh uforadiant-$(UFORADIANT_VERSION)-win32.exe $(USER)@frs.sourceforge.net:uploads/
-	rsync -avP -e ssh ufoai-$(UFOAI_VERSION)-win32.exe $(USER)@frs.sourceforge.net:uploads/
+	rsync -avP -e ssh uforadiant-$(UFORADIANT_VERSION)-macosx-$(TARGET_CPU).dmg $(URL)
+	rsync -avP -e ssh ufoai-$(UFOAI_VERSION)-macosx-$(TARGET_CPU).dmg $(URL)
+	rsync -avP -e ssh ufoai-$(UFOAI_VERSION)-source.tar.bz2 $(URL)
+	rsync -avP -e ssh ufoai-$(UFOAI_VERSION)-linux.run $(URL)
+	rsync -avP -e ssh ufoai-$(UFOAI_VERSION)-data.tar $(URL)
+	rsync -avP -e ssh uforadiant-$(UFORADIANT_VERSION)-win32.exe $(URL)
+	rsync -avP -e ssh ufoai-$(UFOAI_VERSION)-win32.exe $(URL)
 
 create-release: dataarchive wininstaller linuxinstaller macinstaller sourcearchive upload-sf
 create-dev: dataarchive wininstaller linuxinstaller macinstaller sourcearchive
diff --git a/build/install_linux.mk b/build/install_linux.mk
index 5eb539e0bc2..32d4ebd4d7a 100644
--- a/build/install_linux.mk
+++ b/build/install_linux.mk
@@ -1,6 +1,8 @@
 linuxinstaller: installer-pre packdata update_installer_data makeself
 
-LINUX_INST_DIR=contrib/installer/linux
+ROOTDIR=$(shell pwd)
+
+LINUX_INST_DIR=$(ROOTDIR)/contrib/installer/linux
 #everything inside this dir will be compressed to the self extracting archive
 LINUX_INST_DATADIR=$(LINUX_INST_DIR)/data
 #this is only for arranging the path names and tar the zip files
@@ -14,21 +16,16 @@ BINARIES = \
 	ufo \
 	ufoded \
 	ufo2map \
+	ufomodel \
 	base/game.$(SHARED_EXT)
 
-BINARIES_64 = \
-	ufo.x86_64 \
-	ufoded.x86_64 \
-	ufo2map.x86_64 \
-	base/game_x86_64.$(SHARED_EXT)
 
 packdata:
 	@mkdir -p $(LINUX_INST_TMPDIR)/base
 	@tar -cvjp -f $(LINUX_INST_DATADIR)/ufo-x86.tar.bz2 $(BINARIES)
-	@tar -cvjp -f $(LINUX_INST_DATADIR)/ufo-x86_64.tar.bz2 $(BINARIES_64)
-	@cd $(ROOTDIR); tar -cvjp -f $(LINUX_INST_DIR)$(LINUX_INST_DATADIR)/i18n.tar.bz2 base/i18n/ --exclude .svn --exclude updated*
-	@cp $(PAK_FILES) $(LINUX_INST_TMPDIR)/base
-	@cd $(LINUX_INST_TMPDIR); tar -cvp -f ../$(LINUX_INST_DATADIR)/data.tar base
+	@tar -cvjp -f $(LINUX_INST_DATADIR)/i18n.tar.bz2 base/i18n/ --exclude .svn --exclude updated*
+	@cp base/*.pk3 $(LINUX_INST_TMPDIR)/base
+	@cd $(LINUX_INST_TMPDIR) && tar -cvp -f ../data/data.tar base && cd $(ROOTDIR) && pwd
 
 update_installer_data:
 	@sed 's/@VERSION@/$(UFOAI_VERSION)/g' $(LINUX_INST_DIR)/setup.xml.in | sed 's/@LINUX_INST_SIZE@/$(LINUX_INST_SIZE)/g' > $(LINUX_INST_DATADIR)/setup.data/setup.xml
diff --git a/contrib/installer/linux/README.in b/contrib/installer/linux/README.in
index b0775c28e97..27023a417bd 100644
--- a/contrib/installer/linux/README.in
+++ b/contrib/installer/linux/README.in
@@ -22,10 +22,13 @@ SYSTEM REQUIREMENTS
 	SDL >= 1.2.10
 	SDL_ttf >= 2.0.7
 	SDL_mixer >= 1.2.7
+	SDL_image >= 1.2.10
 	libjpeg >= 6.2
 	zlib >= 1.2.3
 	libcurl
 	libpng
+	libtheora
+	libxvidcore
 
 RUNNING THE GAME
 ==================
diff --git a/contrib/installer/linux/setup.xml.in b/contrib/installer/linux/setup.xml.in
index 6fd7081eef5..7e098804d7e 100644
--- a/contrib/installer/linux/setup.xml.in
+++ b/contrib/installer/linux/setup.xml.in
@@ -38,20 +38,6 @@
   </option>
  </component>
 
- <component arch="x86_64" name="x86_64" version="@VERSION@">
-  <option arch="x86_64" install="true">
-   64 bit binaries
-   <binary arch="any" libc="any" binpath="bin/ufoai" symlink="ufoai"
-          icon="ufo.xpm" name="UFO: Alien Invasion 64-bit" menu="Games" desc="UFO: Alien Invasion" play="gui">
-    ufoai
-   </binary>
-   <files>
-    ufo-x86_64.tar.bz2
-    ufo.xpm
-   </files>
-  </option>
- </component>
-
  <component if="|(x86,x86_64)" name="i386" version="@VERSION@">
   <option arch="any" install="true">
    32 bit binaries