swg-source/swg-main
1
0
Fork 0
mirror of https://github.com/SWG-Source/swg-main.git synced 2026-01-16 20:04:18 -05:00
Code Issues Projects Releases Wiki Activity
80 Commits 4 Branches 0 Tags
tekaoh/errorless-cfgs
Commit Graph

80 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tekaoh
bbf428947e Copies a localOptions template and fills in the values 2020-04-18 15:10:21 -04:00
CekisSWG
064754c96f Fixed issue with new repo naming to work with SWG requirements 2020-03-30 16:11:02 -04:00
CekisSWG
f470ec30b3 Updated serverdata version. 2020-03-28 18:23:24 -04:00
Cekis
4e25d56155 Update README.md 2020-03-28 15:18:42 -07:00
Cekis
221f82a751 Update README.md 2020-03-28 15:17:15 -07:00
CekisSWG
983408c908 Added serverdata repo submodule 2020-03-28 18:01:24 -04:00
CekisSWG
b50b951b9c Reconfig repos 2020-03-28 17:59:59 -04:00
CekisSWG
b7d58f03b4 Added a few changes to cleanup actions. 2020-03-26 00:44:41 -04:00
CekisSWG
fcc965395c Oops... didn't miff the CIM file. 2020-03-23 13:25:44 -04:00
CekisSWG
9cffe00fac Added new cleanup and copy targets for ACM building 2020-03-23 12:13:13 -04:00
CekisSWG
96c5c291ef Changed ANT ACM commands to follow naming standard 2020-03-23 11:50:03 -04:00
CekisSWG
28ada0792d Revert "Updated ACM process to not add forced data until after sorting and optimizing." 
This reverts commit 5e01ea206e.
 2020-03-23 11:47:09 -04:00
CekisSWG
7d37da4840 Merge branch 'master' of github.com:SWG-Source/swg-main 2020-03-22 19:10:19 -04:00
CekisSWG
5e01ea206e Updated ACM process to not add forced data until after sorting and optimizing. 2020-03-22 19:10:04 -04:00
Cekis
29255d8b02 Add asset name to the ACM output MIF 2020-03-21 12:19:19 -07:00
Tekaoh
530c82fba9 Hash-Bang should stay at the top, though 2020-02-05 17:31:29 -05:00
Cekis
e390d8f509 Merge pull request #9 from ResurgenceDark/patch-1 
Added Kill Process
 2020-02-04 22:11:35 -08:00
Dark
a8997fdf35 Update startServer.sh 2020-01-28 16:29:52 -06:00
Cekis
497fe3f8d1 Updated Vehicle Data root location 2019-10-08 11:47:56 -07:00
Cekis
5a59786759 Removed calls to Perforce to support ACM building 2019-10-04 11:51:02 -04:00
Cekis
f0df57b92a Fixed CRC calculation in Perl module to match server CRC calc 2019-10-04 11:50:29 -04:00
Cekis
aeadb931a1 Added ACM building to ANT build file. 2019-10-04 11:49:57 -04:00
Cekis
3b67a9f8cc Symlinks now overwrite existing symlinks to avoid build failures 2019-09-30 18:52:54 -04:00
Cekis
cf9405b7c3 Added echo to building Template Files 2019-09-20 00:53:44 -04:00
Cekis
b06ae16a18 Added "update_swg" ant target 2019-09-11 14:24:46 -07:00
Cekis
2d33680e01 Added "update_swg" ant target 
new ant target will update all submodules (with exception to changed log files) and then compile all files (where needed).
 2019-09-11 14:24:14 -07:00
Tekaoh
b2633953dd Update README.md 2019-06-22 19:28:40 -05:00
Tekaoh
84ac9b666f Add log files to gitignore 2019-05-14 12:30:03 -05:00
Cekis
d4f93c52cc Fixed service_name error 2019-05-08 14:08:50 -07:00
Cekis
f7803ebd69 Fixed bug on configs that didn't set service name right. 2019-05-07 17:48:12 -07:00
Tekaoh
77cc05a95b Duh... Forgot to finish my last commit 2019-04-22 15:11:16 -05:00
Tekaoh
1b20e31c53 Let's try a different conditional implementation 2019-04-22 15:07:53 -05:00
Cekis
5f10817243 Added conditional that allows specifying a specific branch on submodules 2019-04-20 09:15:05 -07:00
Cekis
39b60a3e4a Added stationapi branch 2019-04-20 09:12:11 -07:00
Cekis
fce3eb5694 Fixed so stationapi submodule would update appropriately 2019-04-20 09:11:27 -07:00
CekisSWG
0c26a6111c Squashed commit of the following: 
commit b499feffaca921d7303b0e9d41c5a95f4d37cc92
Merge: cd4eadc 07174ee
Author: CekisSWG <cekisswg@gmail.com>
Date:   Fri Apr 19 08:15:37 2019 -0700

    Merge branch 'master' into ant_build

    # Conflicts:
    #	build_linux.sh

commit cd4eadc50a782241b393a55808b6c1c610109f47
Author: CekisSWG <cekisswg@gmail.com>
Date:   Fri Apr 19 08:15:03 2019 -0700

    Updated submodules

commit 30033e17cf8d7e871414e9e83496c823af9f3a7f
Author: CekisSWG <cekisswg@gmail.com>
Date:   Mon Mar 18 23:30:43 2019 -0400

    updated dsrc submodule version

commit 3c938006373d128fc6d354a65740c9a841cde685
Author: CekisSWG <cekisswg@gmail.com>
Date:   Sat Mar 16 20:55:24 2019 -0400

    Fixed some unneeded Java 11 changes

commit 8cecdea1f3a3e7df4892529cfcf292eceaaaa48f
Author: CekisSWG <cekisswg@gmail.com>
Date:   Sat Mar 16 20:18:52 2019 -0400

    Updated build.xml to not pull before compiling

commit 099e5572fb09667042d9b475d77717c06eb95d24
Merge: 64706b1 3dffac9
Author: CekisSWG <cekisswg@gmail.com>
Date:   Thu Mar 14 17:03:29 2019 -0400

    Merge branch 'ant_build' of github.com:SWG-Source/swg-main into ant_build

commit 64706b1180a45f8936d8ca3fa0077c5fe209e5ab
Author: CekisSWG <cekisswg@gmail.com>
Date:   Thu Mar 14 17:03:19 2019 -0400

    Updated Ant build to now checkout specific branches

commit 3dffac9e7aedee902768e0e2dcc7f0c4dc3c6731
Author: Cekis <Cekis@users.noreply.github.com>
Date:   Mon Mar 11 00:06:41 2019 -0700

    Update README.md

commit 8ae089e291b7dcfe60f3a940225aea47d6ba2c05
Author: Cekis <Cekis@users.noreply.github.com>
Date:   Mon Mar 11 00:05:50 2019 -0700

    Update README.md

commit f8820a00ec3db600460534b4e400d0689c2d26da
Author: CekisSWG <cekisswg@gmail.com>
Date:   Mon Mar 11 02:59:27 2019 -0400

    Modified build script to accomodate submodules

commit 99987dce77061cd45d7ae82a334917f472219c65
Author: CekisSWG <cekisswg@gmail.com>
Date:   Mon Mar 11 02:33:40 2019 -0400

    Added config repo

commit b28e57b4ba07a5ea63973b04e7143f50cf099d59
Author: CekisSWG <cekisswg@gmail.com>
Date:   Sun Mar 10 15:23:25 2019 -0400

    Updated per new submodule usage.

commit 169d6c3f71ddee74ae2b07d5faa5407b0d32c8bf
Author: CekisSWG <cekisswg@gmail.com>
Date:   Sun Mar 10 14:55:55 2019 -0400

    Adding submodules to swg-main repo for easier usage.

commit fd865d971d9004b9b80c8b03a8483dccd926b249
Merge: c604a07 a8b9067
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date:   Sun Mar 10 12:03:28 2019 -0500

    Merge remote-tracking branch 'origin/master' into ant_build

commit c604a07b51ea27bd3513c938f2f486bda6e89f48
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date:   Sun Mar 10 11:51:21 2019 -0500

    Update gitignore

commit e0c2b752ecbcac05ccc6c615a7a09ff75d5a0dce
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date:   Sun Mar 10 11:48:26 2019 -0500

    Remove stationapi/ from swg-main. It's getting its own repo.

commit d6b5d90a2cd5b9a8ea3ec41298fbf92c706f70bc
Author: SWG <swg@swg.swg>
Date:   Wed Mar 6 23:59:17 2019 -0500

    Added moving chat binaries to base dir for build chat target

commit 6679836f0157926dfffd3feebcf17061797a3aab
Author: SWG <swg@swg.swg>
Date:   Wed Mar 6 23:49:08 2019 -0500

    Fixed issue where more than one cluster of the same name could be added to the system.

commit cb8ab05d7e64e0c89705d09f3bbbf1a3ddc22a7c
Author: SWG <swg@swg.swg>
Date:   Wed Mar 6 17:06:47 2019 -0500

    fixed merge issues

commit d15dde6ae5b9a997532be2b9548d482068e42c18
Merge: 33fac3c 5f452c7
Author: SWG <swg@swg.swg>
Date:   Wed Mar 6 17:00:41 2019 -0500

    Added initial compile chat server target

commit 33fac3cafb01b353aadbcfb13fd3353e81697581
Author: SWG <swg@swg.swg>
Date:   Wed Mar 6 16:59:48 2019 -0500

    Added initial compile chat server target

commit 5f452c7817a59c4b6d6a221da4e8fe85e9b50ff6
Author: Cekis <Cekis@users.noreply.github.com>
Date:   Sat Mar 2 21:25:03 2019 -0800

    fixed service_name bug

commit 27e6c912f83eb94c30273c3c7baad611c140f734
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date:   Thu Feb 21 16:25:03 2019 -0600

    Set default to something harmless

commit d5f3b42dd204c7cd13c890c35c232012143222d2
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date:   Thu Feb 21 13:31:40 2019 -0600

    Instruct users to make their own local.properties if they want to

commit 915ff5adecdcf60aa0f703eb5f8695013ef09509
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date:   Thu Feb 21 13:29:01 2019 -0600

    Remove sample local.properties... bummer

commit 68d224850b430f8c8c216d2b7cfa35c7fe749180
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date:   Thu Feb 21 12:55:10 2019 -0600

    typos... /facepalm

commit eb9f6c92cddc38da0ead50c072742461f95cfd7e
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date:   Thu Feb 21 12:47:45 2019 -0600

    gitignore local.properties so that settings users change don't mess with future git pulls

commit 70b336ee148afb659729fcba4312b9032a2207a3
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date:   Thu Feb 21 12:45:33 2019 -0600

    Add local.properties so users can change things if they want to

commit 09bc9094c416db0f8bcaa8f20b905ee403657a4f
Author: Tekaoh <45337851+Tekaoh@users.noreply.github.com>
Date:   Thu Feb 21 09:09:38 2019 -0600

    Delete depreciated update script

commit bf979ebdc28887a2a5632b0d39f8c6d186a6ac77
Author: SWG <swg@swg.swg>
Date:   Wed Feb 13 01:35:31 2019 -0500

    Fixed bug caused by bad reference

commit 550ba4660fe4ed7855f0bbe91545be6edd02c654
Author: SWG <swg@swg.swg>
Date:   Tue Feb 12 18:54:45 2019 -0500

    Added targets to configure settings

commit 26f352ed32a374e2135dd86513933027eeffcc16
Author: SWG <swg@swg.swg>
Date:   Tue Feb 12 12:32:48 2019 -0500

    Fixed bugs with ant script

commit 569b62783a2c58b217ea1ba549fe30283923328e
Author: Cekis <cekisswg@gmail.com>
Date:   Fri Feb 8 14:13:42 2019 -0500

    Updated build.xml to handle compiler better and set default to GCC and Release mode

commit d66964b27776ee22147b2b10a5d7e5c6b8eab65d
Author: Cekis <cekisswg@gmail.com>
Date:   Sun Jan 27 19:29:20 2019 -0500

    Added force kill for SwgGameServer processes

commit 2233d2dea70b1dfda11dbb0b123d37766df5e6eb
Merge: d322a0e a7cddbd
Author: Cekis <cekisswg@gmail.com>
Date:   Sun Jan 27 19:08:43 2019 -0500

    Merge branch 'master' of https://github.com/SWG-Source/swg-main into ant_build

commit d322a0eb93ea70726ae089a23db69c3ea6a92a02
Author: Cekis <Cekis@users.noreply.github.com>
Date:   Sat Jan 19 10:36:54 2019 -0800

    Update README.md

commit af69d76ffff17fc4f4886a4caffb394ce7fa2841
Author: CekisSWG <cekisswg@gmail.com>
Date:   Fri Dec 28 16:44:47 2018 -0800

    Updated changes to SQLPlus targets

commit 3b0bf10c0dff0ac9de2e66ee5a8789a467ab505e
Author: CekisSWG <cekisswg@gmail.com>
Date:   Fri Dec 28 21:38:19 2018 +0000

    Adjusted for missing LD_LIBRARY_PATH var - oops

commit 2a25db52d959b0430fc6b62ceba7b8bb8059ea5b
Author: CekisSWG <cekisswg@gmail.com>
Date:   Fri Dec 28 21:31:20 2018 +0000

    Adjusted for missing LD_LIBRARY_PATH var

commit 210397baca401a5ba724f4e945c8efdf15a120e6
Author: CekisSWG <cekisswg@gmail.com>
Date:   Fri Dec 28 20:34:21 2018 +0000

    added an echo to indicate which compiler is being used.

commit ed6d4687c9f30f58ebde9b1af5823e124628f796
Author: CekisSWG <cekisswg@gmail.com>
Date:   Fri Dec 28 20:31:52 2018 +0000

    Added configuration to easily choose gcc or clang compilers

commit ce657b4320
Author: CekisSWG <cekisswg@gmail.com>
Date:   Fri Dec 28 02:36:09 2018 +0000

    Added new ANT build files

commit d66e44c6b9
Author: CekisSWG <cekisswg@gmail.com>
Date:   Thu Dec 27 19:00:41 2018 +0000

    Updated build script to now use ANT for building.
 2019-04-19 08:20:38 -07:00
Tekaoh
07174ee771 Merge pull request #8 from dev-anon/master 
updated build_linux.sh - stationapi can now be cloned or pulled during script activation
 2019-04-02 09:52:50 -05:00
Tekaoh
4b3dbd95db Check to see if stationapi is actually a repo 
Existing VMs will have a stationapi directory that is not hooked up to the repo. This will cause an error because the script will see the stationapi directory but then not be able to `git pull`.  Solve this by checking for the .git directory instead. If it is missing, delete the stationapi directory and clone it from the repo. If .git is already present, go ahead and pull.
 2019-04-02 09:51:32 -05:00
anon_me
92b545c937 updated build_linux.sh to include stationapi which was removed from swg-main repo and put into its own repo 2019-04-02 08:36:15 -05:00
Tekaoh
a8b906765e Update gitignore 2019-03-10 11:51:21 -05:00
Tekaoh
d67e01031f Remove stationapi/ from swg-main. It's getting its own repo. 2019-03-10 11:48:26 -05:00
Tekaoh
ca6e0fc1ec Merge pull request #4 from dev-anon/get_current_branch 
new method retrieving current branch name
 2019-02-11 13:56:51 -06:00
dev-anon
7ecfeb61b4 new method retrieving current branch name 
modified swg-main/utils/buld_java.sh
create method for retrieving the current branch name using git symbolic-ref
replaced hard coded master branch name with the new method
 2019-02-11 11:24:22 -06:00
Tekaoh
a7cddbd8b0 Update debian init script for newer versions of sqlplus and java that are already in the dependencies repo 2019-01-16 15:40:26 -06:00
Elour
732593c6d8 Update build_java for const/final variables 
Multi can be updated with the same method as well, this clears up a few
issues when compiling libraries that other scripts reference consts from
 2018-12-04 15:10:44 -08:00
Tekaoh
1f9e59402c Remove absolute filepaths to add compatibility for users other than swg 2018-12-04 09:26:45 -06:00
Tekaoh
ea30e8b3a3 Add compatibility for lfs when using the dependencies section of build_linux.sh 2018-12-02 21:05:37 -06:00
Tekaoh
8aceafc1e0 Add compatibility for lfs when using the dependencies section of build_linux.sh 2018-12-02 21:03:33 -06:00
Tekaoh
c04b2ba175 stationapi/src/ was gitignored accidently 2018-12-02 18:24:10 -06:00
Myles Markevich
6d246bf3ac Update README.md 2018-11-30 10:37:08 -06:00