Browse Source

BETA: Removed "update" boolean from Ant Zip Task, because it doesn't build the Zip file properly (doesn't remove the old files), and few other changes included for database_installers.

MELERIX 13 years ago
parent
commit
4940ac5617

+ 1 - 1
L2J_DataPack_BETA/build.xml

@@ -40,7 +40,7 @@
 	</target>
 	</target>
 
 
 	<target name="build" depends="dist">
 	<target name="build" depends="dist">
-		<zip destfile="${build}/L2J_DataPack_BETA.zip" basedir="${build.dist}" level="9" update="true" />
+		<zip destfile="${build}/L2J_DataPack_BETA.zip" basedir="${build.dist}" level="9" />
 	</target>
 	</target>
 
 
 	<target name="checkRequirements" description="Check Requirements.">
 	<target name="checkRequirements" description="Check Requirements.">

+ 5 - 5
L2J_DataPack_BETA/dist/sql/community/updates/20110729update.sql

@@ -1,6 +1,6 @@
-ALTER TABLE `clan_introductions`  ENGINE=InnoDB DEFAULT CHARSET=utf8;
-ALTER TABLE `comments`  ENGINE=InnoDB DEFAULT CHARSET=utf8;
-ALTER TABLE `forums`  ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ALTER TABLE `clan_introductions` ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ALTER TABLE `comments` ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ALTER TABLE `forums` ENGINE=InnoDB DEFAULT CHARSET=utf8;
 ALTER TABLE `registered_gameservers` ENGINE=InnoDB DEFAULT CHARSET=utf8;
 ALTER TABLE `registered_gameservers` ENGINE=InnoDB DEFAULT CHARSET=utf8;
-ALTER TABLE `posts`  ENGINE=InnoDB DEFAULT CHARSET=utf8;
-ALTER TABLE `topics`  ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ALTER TABLE `posts` ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ALTER TABLE `topics` ENGINE=InnoDB DEFAULT CHARSET=utf8;

+ 6 - 3
L2J_DataPack_BETA/dist/tools/database_installer.bat

@@ -287,7 +287,7 @@ echo.
 echo Trying to create a Login Server DataBase.
 echo Trying to create a Login Server DataBase.
 set cmdline="%mysqlPath%" -h %lshost% -u %lsuser% --password=%lspass% -e "CREATE DATABASE %lsdb%" 2^> NUL
 set cmdline="%mysqlPath%" -h %lshost% -u %lsuser% --password=%lspass% -e "CREATE DATABASE %lsdb%" 2^> NUL
 %cmdline%
 %cmdline%
-if %ERRORLEVEL% == 0 goto ls_install
+if %ERRORLEVEL% == 0 goto ls_db_ok
 if %safe_mode% == 1 goto omfg
 if %safe_mode% == 1 goto omfg
 
 
 :ls_err2
 :ls_err2
@@ -366,6 +366,7 @@ echo Login Server tables has been deleted.
 goto ls_install
 goto ls_install
 
 
 :ls_upgrade
 :ls_upgrade
+cls
 echo.
 echo.
 echo Upgrading structure of Login Server tables.
 echo Upgrading structure of Login Server tables.
 echo.
 echo.
@@ -448,7 +449,7 @@ echo.
 echo Trying to create a Community Server DataBase...
 echo Trying to create a Community Server DataBase...
 set cmdline="%mysqlPath%" -h %cbhost% -u %cbuser% --password=%cbpass% -e "CREATE DATABASE %cbdb%" 2^> NUL
 set cmdline="%mysqlPath%" -h %cbhost% -u %cbuser% --password=%cbpass% -e "CREATE DATABASE %cbdb%" 2^> NUL
 %cmdline%
 %cmdline%
-if %ERRORLEVEL% == 0 goto cs_install
+if %ERRORLEVEL% == 0 goto cs_db_ok
 if %safe_mode% == 1 goto omfg
 if %safe_mode% == 1 goto omfg
 
 
 :cs_err2
 :cs_err2
@@ -528,6 +529,7 @@ echo Community Server tables has been deleted.
 goto cs_install
 goto cs_install
 
 
 :cs_upgrade
 :cs_upgrade
+cls
 echo.
 echo.
 echo Upgrading structure of Community Server tables.
 echo Upgrading structure of Community Server tables.
 echo.
 echo.
@@ -610,7 +612,7 @@ echo.
 echo Trying to create a Game Server DataBase...
 echo Trying to create a Game Server DataBase...
 set cmdline="%mysqlPath%" -h %gshost% -u %gsuser% --password=%gspass% -e "CREATE DATABASE %gsdb%" 2^> NUL
 set cmdline="%mysqlPath%" -h %gshost% -u %gsuser% --password=%gspass% -e "CREATE DATABASE %gsdb%" 2^> NUL
 %cmdline%
 %cmdline%
-if %ERRORLEVEL% == 0 goto gs_install
+if %ERRORLEVEL% == 0 goto gs_db_ok
 if %safe_mode% == 1 goto omfg
 if %safe_mode% == 1 goto omfg
 
 
 :gs_err2
 :gs_err2
@@ -681,6 +683,7 @@ echo Game Server tables has been deleted.
 goto gs_install
 goto gs_install
 
 
 :gs_upgrade
 :gs_upgrade
+cls
 echo.
 echo.
 echo Upgrading structure of Game Server tables (this could take awhile, be patient).
 echo Upgrading structure of Game Server tables (this could take awhile, be patient).
 echo.
 echo.

+ 3 - 0
L2J_DataPack_BETA/dist/tools/database_installer.sh

@@ -241,6 +241,7 @@ ls_install
 }
 }
 
 
 ls_upgrade(){
 ls_upgrade(){
+clear
 echo ""
 echo ""
 echo "Upgrading structure of Community Server tables."
 echo "Upgrading structure of Community Server tables."
 echo ""
 echo ""
@@ -326,6 +327,7 @@ cs_install
 }
 }
 
 
 cs_upgrade(){
 cs_upgrade(){
+clear
 echo ""
 echo ""
 echo "Upgrading structure of Game Server tables."
 echo "Upgrading structure of Game Server tables."
 echo ""
 echo ""
@@ -411,6 +413,7 @@ gs_install
 }
 }
 
 
 gs_upgrade(){
 gs_upgrade(){
+clear
 echo ""
 echo ""
 echo "Upgrading structure of Game Server tables (this could take awhile, be patient)"
 echo "Upgrading structure of Game Server tables (this could take awhile, be patient)"
 echo ""
 echo ""