Commit Graph

39 Commits (master)

Author SHA1 Message Date
Michael Werle 290e855b0b Fixes to deb-package builds.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4475 127b21dd-08f5-0310-b4b7-95ae10353056
2011-03-15 11:22:08 +00:00
Michael Werle 08bdbe1ef1 More debian build tweaks.
- removed 'espeak-data' from package
 - by request, cleaning the package also dist-cleans libjs

Also updated copyright notice and man page.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4436 127b21dd-08f5-0310-b4b7-95ae10353056
2011-03-06 03:52:13 +00:00
Michael Werle 200902f9da Applied a (slightly tweaked) patchset sent in by Nicolas Boulenguez, the Debian maintainer of Oolite.
Changes consist of:
 - use #include instead of #import for C header files.
 - explicitly #include <assert.h> in various source files.
 - tweaks to build process for Debian.
 - deleted obsolete src/SDL/make* package building scripts.

"Works for me" - please check build process still works for you; esp. on Windows
.



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4433 127b21dd-08f5-0310-b4b7-95ae10353056
2011-03-05 03:14:05 +00:00
Michael Werle 0ad42dc3d0 Minor tweaks to Debian packaging - source package needs to rely on zip and curl for auto-building.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4376 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-18 23:20:27 +00:00
Michael Werle d915f5fde5 Makefiles - rework to accomodate new Javascript library
(Combined effort from Micha, Konstantinos, and Nikos)
 + removed support for building legacy libjs
 + (Linux only) now use the MacOS update script to auto-download the JS library
     - download script failure checks tweaked for older versions of bash
 + new Makefiles:
     - libjs.make - to download & build libjs (Linux only)
     - config.make - contains shared configuration variables between makefiles
 + debian packaging rules updated to suit



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4362 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-16 13:24:56 +00:00
Michael Werle e80f7a1dcf Removed the bespoke apply-patches script for Debian; no longer required with new quilt-based package format.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3640 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-29 15:37:49 +00:00
Michael Werle 428c5a5f02 Converted debian package structure to v3, as per Darren Salt's suggestion in order to make it easier for downstream packagers.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3620 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-27 08:26:13 +00:00
Michael Werle 9ac5d02bed Revert the GNUmakefile to compile, by default, using system-dependecies. This makes it easier for developers rather than packagers. Associated changes to not break packaging build rules.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3448 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-02 19:14:29 +00:00
Darren Salt 801be96415 Correctly quote command-line arguments.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3379 127b21dd-08f5-0310-b4b7-95ae10353056
2010-05-19 16:30:30 +00:00
getafix 659714282e deb packages: Updated oolite wrapper script to support command line arguments.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3378 127b21dd-08f5-0310-b4b7-95ae10353056
2010-05-19 10:06:32 +00:00
Michael Werle 949f8d2e36 * Fixed (?) broken build on Windows due to last commit.
* Included Makefile fix from Getafix to only use libespeak for Linux builds, not Windows.
* By default, (GNU)Makefile will now build using dependencies distributed in the Oolite repository
* Added new GNUMakefile switch (use_distro_deps=yes/no) to use locally installed header files and libraries


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3237 127b21dd-08f5-0310-b4b7-95ae10353056
2010-04-28 17:02:16 +00:00
getafix de60dba4e3 Transparent linux-x86, linux-x86_64 build and autopackage-packaging with
new Linux-deps folder (ready for distro independent build) and 
updated Makefile, GNUmakefile and autopackage apspec files

Speech support with eSpeak compiled using PulseAudio instead of the default PortAudio.
(Smoother inter-distro speech execution when eSpeak does not use PortAudio)

Fixed oolite-update to include itself during updates

Fixed oolite wrapper-scripts not passing command line arguments to oolite executable

Updated Linux README.TXT, PLAYING.TXT files

Dependency libraries updates:
   gnustep-base-1.18 - VSync issue addressed (noticed on nVidia cards). Fixed the tearing issue enabling smooth video scrolling.
   SDL-1.2.14
   libpng14
   eSpeak-1.43.03 - Supports klat voices

Deleted Linux-x86-deps/
Deleted installers/autopackage/default.apspec



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3233 127b21dd-08f5-0310-b4b7-95ae10353056
2010-04-28 09:37:38 +00:00
Darren Salt f7cdd77ca8 More cleanup fallout.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2814 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-30 19:49:34 +00:00
Jens Ayton 0aaa11f0e0 Fixed build breakages.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2813 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-30 19:10:55 +00:00
Jens Ayton b3f7f8508a Tidying up in project directory.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2793 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-28 14:25:17 +00:00
Darren Salt f687e6d385 Fix a .deb build bug which prevents successive builds without regenerating the executable.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2671 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-12 21:57:48 +00:00
Michael Werle 7d00c2cb77 Fix dh_lintian call for Ubuntu "hardy"
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2652 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-08 09:05:40 +00:00
Darren Salt 545437da88 Shut lintian up.
Alternatives: symlink the Resources dir, with the real dir being somewhere in /usr/share, but this causes upgrade problems (dpkg will not replace a directory with a symlink), or to symlink

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2646 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-07 19:26:44 +00:00
Darren Salt 2e7b25128d Debian package bits: bump standards version & fix up the copyright file.
This leaves many warnings in place - one about dh_desktop deprecation, and many
about files which should be in /usr/share.
Also, the current version is 3.8.3; 3.8.0 is chosen for lenny compatibility.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2645 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-07 16:43:30 +00:00
Michael Werle c7bd78d83a Minor tweaks to automated Debian version numbering from 1.73-maintenace.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2460 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-09 21:43:07 +00:00
Nikos Barkas 2e03c6dff4 Updated a couple of previously forgotten files with the new location of Oolite's Reference Sheet.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2436 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-08 17:34:15 +00:00
Michael Werle d7ed9045cf Automatic Debian version numbering
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2384 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-05 09:40:57 +00:00
Michael Werle 28bc447fc5 Minor updates to the Debian man page and changelog and tweaked build rules slightly to include contributors.txt and not compress the OoliteRS.pdf file.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2359 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-03 06:36:25 +00:00
Darren Salt 9a25bab0d2 Bump .deb version number.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2340 127b21dd-08f5-0310-b4b7-95ae10353056
2009-08-30 20:01:47 +00:00
Jens Ayton 6aaf7a1e75 Committed unspeakable necromancy on the graveyard of the repository.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2331 127b21dd-08f5-0310-b4b7-95ae10353056
2009-08-29 23:09:22 +00:00
Jens Ayton 999fe7e969 Trying to convince svn that this deleted directory is really deleted.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2330 127b21dd-08f5-0310-b4b7-95ae10353056
2009-08-29 22:50:59 +00:00
Darren Salt f2efe5fbec Add some extra info to debian/control; add debian/copyright.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2171 127b21dd-08f5-0310-b4b7-95ae10353056
2009-05-07 22:44:17 +00:00
Darren Salt 07ef0e42d6 Fix handling of oolite.dbg when building .debs with DEB_BUILD_OPTIONS=noopt.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2170 127b21dd-08f5-0310-b4b7-95ae10353056
2009-05-07 22:08:21 +00:00
Darren Salt 05120ef44c Have functions for determining sort order return NSComparisonResult, not int.
Remove the corresponding Debian-specific patch, which only partially addressed

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2168 127b21dd-08f5-0310-b4b7-95ae10353056
2009-05-07 21:22:17 +00:00
Darren Salt 43cf6cfb58 Set Terminal=false in the .desktop file.
Remove the corresponding Debian-specific patch.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2167 127b21dd-08f5-0310-b4b7-95ae10353056
2009-05-07 21:09:59 +00:00
Darren Salt 06e1b0f131 CRLF → LF fixup.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2163 127b21dd-08f5-0310-b4b7-95ae10353056
2009-05-03 20:55:41 +00:00
Darren Salt f2293e5072 Remove an obsolete patch file.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2147 127b21dd-08f5-0310-b4b7-95ae10353056
2009-04-28 13:57:29 +00:00
Jens Ayton 886bfccbab Applied dsalt's libespeak patch. It doesn't work for me, but the build is fine if not built with make libespeak=yes so it doesn't hurt anything.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2091 127b21dd-08f5-0310-b4b7-95ae10353056
2009-03-15 16:14:03 +00:00
Michael Werle f65d5b21f0 * fix oversights from build-system-revamp commit
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1858 127b21dd-08f5-0310-b4b7-95ae10353056
2008-11-15 10:24:21 +00:00
Michael Werle ceb2b2e302 * Revamped build system - should make it a lot easier for people to build the sources and create packages
** Use "make -f Makefile help" to see a list of targets
** Updated Windows NSIS Packager rules
** Minor Tweaks to Debian rules

* Updated SpiderMonkey from 1.7 pre-release to 1.7 (minor changes only)
** Supplied new js32.dll for Windows (built with MSVC)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1857 127b21dd-08f5-0310-b4b7-95ae10353056
2008-11-15 09:54:01 +00:00
Michael Werle 77703f89b6 Significant changes to the Debian build rules, largely copied from Darren
Salt's work from Bug #14126.

To build run 'debuild binary' in the root and to clean 'debuild clean'.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1837 127b21dd-08f5-0310-b4b7-95ae10353056
2008-11-07 01:12:48 +00:00
Jens Ayton 71d7a25468 Removed debug code from OOSkyDrawable, and made it use OOMacroOpenGL. Added code to help catch occasional drawing glitch with sun. Disabled pruning of on-disk cache completely; as we now clear the cache when OXP search paths change, its size is bounded by the total size of installed OXPs.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1032 127b21dd-08f5-0310-b4b7-95ae10353056
2007-06-16 18:01:41 +00:00
Jens Ayton 187e58eb0c Fix for lots of 'file not found' messages under Windows. Updated README.txt.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1030 127b21dd-08f5-0310-b4b7-95ae10353056
2007-06-12 08:43:59 +00:00
hikari ba1c215ff6 Modifed Linux specific portions of the build rules.
Added Ubuntu/Debian build glue.



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1029 127b21dd-08f5-0310-b4b7-95ae10353056
2007-06-11 17:24:23 +00:00