Skip to content
Permalink
Browse files

Move to a subdirectory

  • Loading branch information...
o11c committed Jun 19, 2011
1 parent 319f805 commit bae4b92e560c2694eaaf0e8b4d9e95e56204471b
Showing 732 changed files with 214 additions and 88 deletions.
@@ -1,35 +1,4 @@
*.class

# Local configuration files
conf/*_local.conf
conf/eathena-monitor.conf
conf/gm_account.txt
conf/help.txt
conf/magic.conf
conf/motd.txt
conf/spells-build

# Build files
eathena-monitor
eathena.sh

# Copied/linked server executables
char-server
login-server
map-server

# Tools executables
tools/retab

# Server files
log/
gm.log.*
online.*
save/*.tmp
save/*.txt

# Converter files
tools/tmwcon/converter.jar
tools/tmwcon/server-data
tools/tmwcon/summary.txt
tools/tmwcon/tmwdata
@@ -0,0 +1,31 @@
Changing stuff into subdirectories has several problems:
1. There are files that are copied
2. You may need to change
3. git submodules don't automatically work the way you think they should - you have to add a git hook manually. Unfortunately, there is no hook at all for git reset --hard (use git checkout -B instead)

problem 2 will be solved (or at least ameliorated) by creating scripts in the root (which may conflict with existing names, but hey! I need your attention)
problems 1 and 3 should be solved by running a script
Stuff to do manually:
* put login-server, char-server, map-server binaries in /usr/local/bin (or some other location callable from the scripts)
Stuff to do later:
* change the client-data submodule to track the main project and delete the testing repository for client data

Stuff to do much later:
* move login/ to the server repository
* Store stuff in a well-known directory
* create a 'make install' target
* create /etc/init.d scripts and get packaged

-o11c


Useful commands:
git submodule update lose changes in submodule and reset to upstream
git submodule update --merge merge changes in submodule from upstream
git submodule update --rebase rebase local changes on top of upstream
(use this, for the same reason you should use git pull --rebase instead of just git pull - but remember that it's dangerous)
git submodules sync change the url of the submodule (when testing is deleted)
git config --global url.git@gitorious.org:.pushInsteadOf git://gitorious.org
for people with push access: don't pull via ssh (which is slower anyway), required for submodules to work properly
git checkout HEAD^ -B master completely roll back the latest commit
git reset HEAD^ undo the last commit but keep changes
@@ -0,0 +1,4 @@
#!/bin/sh
cd world &&
exec char-server

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -0,0 +1,4 @@
#!/bin/sh
cd login &&
exec login-server

@@ -0,0 +1,2 @@
/*_local.conf
/gm_account.txt
File renamed without changes.
@@ -0,0 +1,58 @@
// Note: this file is used by both the char-server and the login-server

// This file is necessary to connect to your server locally:
// by using it's internal (LAN) IP address, or localhost (127.0.0.1)

// The default version treats you LAN as localhost only,
// which is fine if you have only one computer
// You only need to change this file if you have a public server
// AND want to connect from other machines in the LAN
// (for an nonpublic server it would be best to leave localhost as LAN
// and treat the rest of your LAN as the WAN)

// Note: if you set up this file to point to your real LAN, you will not
// be able to do:
// mana --server localhost --port 6901
// or mana --server 127.0.0.1 --port 6901
// because of the check_ip_flag: yes option
// (which will become mandatory in the next release of the server)
// instead do:
// mana --server 192.168.1.100 --port 6901
// or maybe, depending on how your /etc/hosts and /etc/host.conf are setup,
// mana --server ben-desktop --port 6901
// or mana --server ben-desktop.local --port 6901

// Note that only one IP is used, so you can't put different char servers
// on different machines (unless you do some internal port-forwarding)


// the IP LAN players should use to connect to the char-server
lan_char_ip: 127.0.0.1
// lan_char_ip: 192.168.1.100

// the IP that LAN players should use to connect to the map-server
lan_map_ip: 127.0.0.1
// lan_map_ip: 192.168.1.100

// put here the Subnet mask of your LAN
// see output of ifconfig (Linux) or ipconfig (Windows)
subnet: 127.0.0.1
subnetmask: 255.255.255.255
// subnetmask: 255.0.0.0


// Common subnets (if you have a subnet that is not one of these,
// you probably don't need to be reading this)

// subnet: 10.0.0.0
// subnetmask: 255.0.0.0

// subnet: 172.16.0.0
// subnetmask: 255.240.0.0

// subnet: 192.168.0.0
// subnetmask: 255.255.0.0

// Many home routers only use a portion:
// subnet: 192.168.1.0
// subnetmask: 255.255.255.0
@@ -75,7 +75,7 @@ start_limited_time: -1
// Note: if you enable this option, be sure that your (local/lan/wan) players use correct ip (in xml file) to contact servers,
// and that your LAN is correctly configured (!), and that LAN configuration of eathena is right.
// if not correct, you can read list of char-servers, but not look slots of characters (rejected by server).
check_ip_flag: no
check_ip_flag: yes

// Specify order of IP control if necessary (option: 'deny,allow', 'allow,deny', or 'mutual-failture')
// (how to use 'allow' and 'deny' information)
@@ -0,0 +1 @@
/account.txt
File renamed without changes.
@@ -0,0 +1,4 @@
#!/bin/sh
cd world/map &&
exec map-server

@@ -0,0 +1,32 @@
mv online.html online.txt world/

mv save/account.txt login/save/

mv save/accreg.txt world/save/
mv save/athena.txt world/save/
mv save/storage.txt world/save/
mv save/party.txt world/save/
mv save/castle.txt world/save/
mv save/guild.txt world/save/

mv save/mapreg.txt world/map/save/

rmdir save


rm conf/eathena-monitor.conf

mv conf/login_local.conf login/conf/
mv conf/ladmin_local.conf login/conf/
mv conf/gm_account.txt login/conf/

mv conf/char_local.conf world/conf/

mv conf/atcommand_local.conf world/map/conf/
mv conf/battle_local.conf world/map/conf/
mv conf/map_local.conf world/map/conf/
mv conf/help.txt world/map/conf/
mv conf/motd.txt world/map/conf/
mv conf/magic.conf world/map/conf/
mv conf/spells-build world/map/conf/
rmdir conf
@@ -0,0 +1,3 @@
*.class
/summary.txt
/converter.jar
@@ -0,0 +1 @@
/*_local.conf
@@ -75,7 +75,9 @@ char_name_option: 1
// Note: add 'space' between 2 others letters/symbols.
// default: void.
// char_name_letters: [ ] { } , . | - # @ ! ~ ` ; : " " ? / \ = + < >
char_name_letters: a b c d e f g h i j k l m n o p r s t q u v w x y z A B C D E F G H I J K L M N O P R S T Q U V W X Y Z 1 2 3 4 5 6 7 8 9 0 - _ + = ! @ $ % ^ & * ( ) : ; ' < > , . ? / ~ ` | \
// Note: some characters are problematic:
// : is used as a separator
char_name_letters: a b c d e f g h i j k l m n o p r s t q u v w x y z A B C D E F G H I J K L M N O P R S T Q U V W X Y Z 1 2 3 4 5 6 7 8 9 0 - _ + = ! @ $ % ^ & * ( ) ; ' < > , . ? / ~ ` | \

// Filename of the file which receives the online players list in text
online_txt_filename: online.txt
File renamed without changes.
@@ -0,0 +1,58 @@
// Note: this file is used by both the char-server and the login-server

// This file is necessary to connect to your server locally:
// by using it's internal (LAN) IP address, or localhost (127.0.0.1)

// The default version treats you LAN as localhost only,
// which is fine if you have only one computer
// You only need to change this file if you have a public server
// AND want to connect from other machines in the LAN
// (for an nonpublic server it would be best to leave localhost as LAN
// and treat the rest of your LAN as the WAN)

// Note: if you set up this file to point to your real LAN, you will not
// be able to do:
// mana --server localhost --port 6901
// or mana --server 127.0.0.1 --port 6901
// because of the check_ip_flag: yes option
// (which will become mandatory in the next release of the server)
// instead do:
// mana --server 192.168.1.100 --port 6901
// or maybe, depending on how your /etc/hosts and /etc/host.conf are setup,
// mana --server ben-desktop --port 6901
// or mana --server ben-desktop.local --port 6901

// Note that only one IP is used, so you can't put different char servers
// on different machines (unless you do some internal port-forwarding)


// the IP LAN players should use to connect to the char-server
lan_char_ip: 127.0.0.1
// lan_char_ip: 192.168.1.100

// the IP that LAN players should use to connect to the map-server
lan_map_ip: 127.0.0.1
// lan_map_ip: 192.168.1.100

// put here the Subnet mask of your LAN
// see output of ifconfig (Linux) or ipconfig (Windows)
subnet: 127.0.0.1
subnetmask: 255.255.255.255
// subnetmask: 255.0.0.0


// Common subnets (if you have a subnet that is not one of these,
// you probably don't need to be reading this)

// subnet: 10.0.0.0
// subnetmask: 255.0.0.0

// subnet: 172.16.0.0
// subnetmask: 255.240.0.0

// subnet: 192.168.0.0
// subnetmask: 255.255.0.0

// Many home routers only use a portion:
// subnet: 192.168.1.0
// subnetmask: 255.255.255.0
@@ -0,0 +1,5 @@
/*_local.conf
/help.txt
/magic.conf
/motd.txt
/spells-build
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.

0 comments on commit bae4b92

Please sign in to comment.
You can’t perform that action at this time.