Merge branch 'master' into script/guild

Signed-off-by: Cydh Ramdh <cydh@pservero.com>

.gitignore

@@ -12,6 +12,7 @@ Thumbs.db
 # /
 /*_fifo
 /*.exe
+/*.exe.*
 /*.ilk
 /*.log
 /*.ncb
@@ -22,17 +23,17 @@ Thumbs.db
 /*.sdf
 /*.stackdump
 /*.suo
-/char-server_sql
+*.o
+*.a
+*.yml
 /char-server
 /config.log
 /config.status
 /core
 /ipch
-/login-server_sql
 /login-server
 /Makefile
 /Makefile.cache
-/map-server_sql
 /map-server
 /mapcache
 /nbproject
@@ -98,30 +99,37 @@ Thumbs.db
 /tools/*.pdb
 
 # /vcproj-13/
-/vcproj-13/char-server_sql
-/vcproj-13/login-server_sql
+/vcproj-13/char-server
+/vcproj-13/login-server
 /vcproj-13/mapcache
-/vcproj-13/map-server_sql
+/vcproj-13/map-server
 /vcproj-13/*.user
 
 # /vcproj-12/
-/vcproj-12/char-server_sql
-/vcproj-12/login-server_sql
+/vcproj-12/char-server
+/vcproj-12/login-server
 /vcproj-12/mapcache
-/vcproj-12/map-server_sql
+/vcproj-12/map-server
 /vcproj-12/*.user
 
 # /vcproj-10/
-/vcproj-10/char-server_sql
-/vcproj-10/login-server_sql
+/vcproj-10/char-server
+/vcproj-10/login-server
 /vcproj-10/mapcache
-/vcproj-10/map-server_sql
+/vcproj-10/map-server
 /vcproj-10/*.user
 
 # /vcproj-9/
 /vcproj-9/*.user
-/vcproj-9/char-server_sql
-/vcproj-9/login-server_sql
-/vcproj-9/map-server_sql
+/vcproj-9/char-server
+/vcproj-9/login-server
+/vcproj-9/map-server
 /vcproj-9/mapcache
-/conf/.tmp-desd_conf.yml
+/.idea/.name
+/.idea/misc.xml
+/.idea/modules.xml
+/.idea/rathena.iml
+/.idea/vcs.xml
+/.idea/workspace.xml
+/build/
+

.travis.yml

@@ -2,18 +2,32 @@ language: c
 compiler:
   - clang
   - gcc
-  
+
 before_script:
-  - uname -a  
+  - uname -a
+  - mysql -u $DB_ROOT -e "CREATE DATABASE $DB_NAME;" || aborterror "Unable to create database."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/main.sql || aborterror "Unable to import main database."
+  - mysql -u $DB_ROOT $DB_NAME < sql-files/logs.sql || aborterror "Unable to import logs database."
+  - mysql -u $DB_ROOT -e "GRANT ALL ON *.* TO '$DB_USER'@'$DB_HOST' IDENTIFIED BY '$DB_PASS';"
 
-script: 
-  - ./configure && make sql
+script:
+  - ./configure $CONFIGURE_FLAGS
   - make clean
-  - ./configure --enable-prere && make sql
-
+  - make server
+  - 'echo packet_db_ver: $PACKETDBVER >> db/import/packet_db.txt'
+  - ./map-server --run-once
+
+env:
+  global:
+    - DB_ROOT="root"
+    - DB_HOST="127.0.0.1"
+    - DB_NAME="ragnarok"
+    - DB_USER="ragnarok"
+    - DB_PASS="ragnarok"
+    - PACKETDBVER=45
+  matrix:
+    - CONFIGURE_FLAGS="--enable-prere=no"
+    - CONFIGURE_FLAGS="--enable-prere=yes"
+
 notifications:
   email: false
-
-branches:
-  only:
-    - master 

3rdparty/libconfig/Makefile.in

@@ -7,30 +7,33 @@ LIBCONFIG_AR = obj/libconfig.a
 @SET_MAKE@
 
 #####################################################################
-.PHONY : all clean help
+.PHONY : all clean help libconfig
 
-all: $(LIBCONFIG_AR)
+all: libconfig
 
 clean:
 	@echo "	CLEAN	libconfig"
 	@rm -rf obj *.o
 
 help:
 	@echo "possible targets are 'all' 'clean' 'help'"
-	@echo "'all'    - builds $(LIBCONFIG_DIR_OBJ)"
-	@echo "'clean'  - deletes $(LIBCONFIG_DIR_OBJ)"
-	@echo "'help'   - outputs this message"
+	@echo "'libconfig' - build $(LIBCONFIG_AR)
+	@echo "'all'       - builds $(LIBCONFIG_DIR_OBJ)"
+	@echo "'clean'     - deletes $(LIBCONFIG_DIR_OBJ)"
+	@echo "'help'      - outputs this message"
 
 #####################################################################
 
-obj_dir:
+obj:
 	@echo "	MKDIR	obj"
 	@-mkdir obj
 
 obj/%.o: %.c $(LIBCONFIG_H)
 	@echo "	CC	$<"
-	@@CC@ @CFLAGS@ @DEFS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+	@@CC@ @CFLAGS_AR@ @DEFS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
 
-$(LIBCONFIG_AR): obj_dir $(LIBCONFIG_DIR_OBJ)
+libconfig: obj $(LIBCONFIG_DIR_OBJ) $(LIBCONFIG_AR)
+
+$(LIBCONFIG_AR): $(LIBCONFIG_DIR_OBJ)
 	@echo "	AR	$@"
 	@@AR@ rcs obj/libconfig.a $(LIBCONFIG_DIR_OBJ)

3rdparty/libconfig/libconfig.c

@@ -4,18 +4,19 @@
 
    This file is part of libconfig.
 
-   This library is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this library.  If not, see <http://www.gnu.org/licenses/>.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public License
+   as published by the Free Software Foundation; either version 2.1 of
+   the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, see
+   <http://www.gnu.org/licenses/>.
    ----------------------------------------------------------------------------
 */
 
@@ -535,12 +536,12 @@ static int __config_validate_name(const char *name)
   if(*p == '\0')
     return(CONFIG_FALSE);
 
-  if(! isalpha((unsigned char)*p) && (*p != '*'))
+  if(! isalpha((int)*p) && (*p != '*'))
     return(CONFIG_FALSE);
 
   for(++p; *p; ++p)
   {
-    if(! (isalpha((unsigned char)*p) || isdigit((unsigned char)*p) || strchr("*_-", (int)*p)))
+    if(! (isalpha((int)*p) || isdigit((int)*p) || strchr("*_-", (int)*p)))
       return(CONFIG_FALSE);
   }
 

3rdparty/libconfig/libconfig.h

@@ -4,18 +4,19 @@
 
    This file is part of libconfig.
 
-   This library is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this library.  If not, see <http://www.gnu.org/licenses/>.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public License
+   as published by the Free Software Foundation; either version 2.1 of
+   the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, see
+   <http://www.gnu.org/licenses/>.
    ----------------------------------------------------------------------------
 */
 
@@ -40,7 +41,7 @@ extern "C" {
 
 #define LIBCONFIG_VER_MAJOR    1
 #define LIBCONFIG_VER_MINOR    4
-#define LIBCONFIG_VER_REVISION 8
+#define LIBCONFIG_VER_REVISION 9
 
 #include <stdio.h>
 

3rdparty/libconfig/parsectx.h

@@ -4,18 +4,19 @@
 
    This file is part of libconfig.
 
-   This library is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this library.  If not, see <http://www.gnu.org/licenses/>.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public License
+   as published by the Free Software Foundation; either version 2.1 of
+   the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, see
+   <http://www.gnu.org/licenses/>.
    ----------------------------------------------------------------------------
 */
 

3rdparty/libconfig/scanctx.c

@@ -4,18 +4,19 @@
 
    This file is part of libconfig.
 
-   This library is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this library.  If not, see <http://www.gnu.org/licenses/>.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public License
+   as published by the Free Software Foundation; either version 2.1 of
+   the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, see
+   <http://www.gnu.org/licenses/>.
    ----------------------------------------------------------------------------
 */
 

3rdparty/libconfig/scanctx.h

@@ -4,18 +4,19 @@
 
    This file is part of libconfig.
 
-   This library is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this library.  If not, see <http://www.gnu.org/licenses/>.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public License
+   as published by the Free Software Foundation; either version 2.1 of
+   the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, see
+   <http://www.gnu.org/licenses/>.
    ----------------------------------------------------------------------------
 */