mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Version bump.

This commit is contained in:
skydive 2006-07-23 10:25:13 +00:00
parent 2f378ba1d5
commit 53d6bc0f29
5 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/common/README
View File

@ -116,6 +116,6 @@ http://sourceforge.net/tracker/?func=add&group_id=43225&atid=435578
VI. About
=================================
Content is (C) 2002-2005 The FreeCol Team
Content is (C) 2002-2006 The FreeCol Team
The authors of FreeCol can be found on the FreeCol homepage.
FreeCol's homepage can be found at http://freecol.sourceforge.net

2
packaging/targz/create_src_tar_gz.sh
View File

@ -20,7 +20,7 @@
# Location of the freecol CVS directory.
FREECOL_CVS_DIR=/home/`whoami`/freecol
# The current FreeCol version
VERSION="0.4.0"
VERSION="0.5.0"

2
packaging/targz/create_tar_gz.sh
View File

@ -20,7 +20,7 @@
# Location of the freecol CVS directory.
FREECOL_CVS_DIR=/home/`whoami`/freecol
# The current FreeCol version
VERSION="0.4.0"
VERSION="0.5.0"

2
packaging/targz/create_zip.sh
View File

@ -20,7 +20,7 @@
# Location of the freecol CVS directory.
FREECOL_CVS_DIR=/home/`whoami`/freecol
# The current FreeCol version
VERSION="0.4.0"
VERSION="0.5.0"

38
src/net/sf/freecol/FreeCol.java
View File

@ -39,7 +39,7 @@ public final class FreeCol {
public static final Specification specification = new Specification();
private static final String FREECOL_VERSION = "0.4.1";
private static final String FREECOL_VERSION = "0.5.0";
public static final String META_SERVER_ADDRESS = "meta.freecol.org";
public static final int META_SERVER_PORT = 3540;
@ -75,16 +75,6 @@ public final class FreeCol {
* @param args The command-line arguments.
*/
public static void main(String[] args) {
// TODO: The location of the save directory should be determined by the installer.
saveDirectory = new File(System.getProperty("user.home"));
if (!saveDirectory.exists()) {
saveDirectory = new File("save");
} else {
saveDirectory = new File(saveDirectory, ".freecol" + FILE_SEP + "save");
}
if (!saveDirectory.exists()) {
saveDirectory.mkdirs();
}
handleArgs(args);
@ -113,8 +103,22 @@ public final class FreeCol {
} catch (FreeColException e) {
e.printStackTrace();
}
if (standAloneServer) {
// TODO: The location of the save directory should be determined by the installer.
saveDirectory = new File(System.getProperty("user.home"));
if (!saveDirectory.exists()) {
saveDirectory = new File("save");
} else {
saveDirectory = new File(saveDirectory, "freecol" + FILE_SEP + "save");
}
if (!saveDirectory.exists()) {
saveDirectory.mkdirs();
}
if (standAloneServer) {
logger.info("Starting stand-alone server.");
try {
final FreeColServer freeColServer = new FreeColServer(true, false, serverPort, serverName);
@ -307,14 +311,8 @@ public final class FreeCol {
if (i < args.length) {
savegameFile = new File(args[i]);
if (!savegameFile.exists() || !savegameFile.isFile()) {
/* The savegame file could not be found. Trying to
* locate the file in the savegame directory:
*/
savegameFile = new File(saveDirectory, args[i]);
if (!savegameFile.exists() || !savegameFile.isFile()) {
System.out.println("The given savegame file could not be found: " + args[i]);
System.exit(1);
}
System.out.println("The given savegame file could not be found: " + args[i]);
System.exit(1);
}
} else {
printUsage();