Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 11:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

nirai: allow for custom config paths

Browse source
This commit is contained in:
Master Jumblespeed 2015-09-06 04:31:39 -04:00
parent 5b3e475c78
commit 975f3f2bb5
5 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -1,6 +1,6 @@
[submodule "resources"] [submodule "resources"]
path = resources path = resources
url=https://github.com/Toontown-Stride/resources url=git@github.com:Toontown-Stride/resources.git
[submodule "build/nirai/src"] [submodule "build/nirai/src"]
path = build/nirai/src path = build/nirai/src
url = https://github.com/nirai-compiler/src url = https://github.com/nirai-compiler/src

8
build/make.py
View file

@ -43,7 +43,7 @@ def niraicall_obfuscate(code):
niraimarshal.niraicall_obfuscate = niraicall_obfuscate niraimarshal.niraicall_obfuscate = niraicall_obfuscate
class StridePackager(NiraiPackager): class StridePackager(NiraiPackager, configPath=None):
HEADER = 'TTSTRIDE' HEADER = 'TTSTRIDE'
BASEDIR = '..' + os.sep BASEDIR = '..' + os.sep
@ -52,6 +52,7 @@ class StridePackager(NiraiPackager):
self.__manglebase = self.get_mangle_base(self.BASEDIR) self.__manglebase = self.get_mangle_base(self.BASEDIR)
self.add_panda3d_dirs() self.add_panda3d_dirs()
self.add_default_lib() self.add_default_lib()
self.globalConfigPath = configPath if configPath is not None else '../deployment/public_client.prc'
def add_source_dir(self, dir): def add_source_dir(self, dir):
self.add_directory(self.BASEDIR + dir, mangler=self.__mangler) self.add_directory(self.BASEDIR + dir, mangler=self.__mangler)
@ -70,9 +71,7 @@ class StridePackager(NiraiPackager):
def generate_niraidata(self): def generate_niraidata(self):
print 'Generating niraidata' print 'Generating niraidata'
# Config config = self.get_file_contents(self.globalConfigPath)
config = self.get_file_contents('../dependencies/config/general.prc')
config += '\n\n' + self.get_file_contents('../dependencies/config/release/dev.prc')
config_iv = self.generate_key(16) config_iv = self.generate_key(16)
config_key = self.generate_key(16) config_key = self.generate_key(16)
@ -95,7 +94,6 @@ class StridePackager(NiraiPackager):
dg.appendData(data) dg.appendData(data)
data = dg.getMessage() data = dg.getMessage()
#compressed = compress_string(data, 9)
iv = self.generate_key(16) iv = self.generate_key(16)
key = self.generate_key(16) key = self.generate_key(16)
fixed_key = ''.join(chr((i ^ (7 * i + 16)) % ((i + 5) * 3)) for i in xrange(16)) fixed_key = ''.join(chr((i ^ (7 * i + 16)) % ((i + 5) * 3)) for i in xrange(16))

2
build/nirai/panda3d

@ -1 +1 @@
Subproject commit 510b6b2b3fef1674611e4666b45db949868a8869 Subproject commit e4743737b0572feab80a08959f2b4d865ab3bc62

2
build/nirai/src

@ -1 +1 @@
Subproject commit 936977760bfac218f634533dd4d926ad7e8e2092 Subproject commit 3d29188a91b658f61cd2c3b3b8ada23050d4f230

2
resources

@ -1 +1 @@
Subproject commit 4e2986832f047ae4e8f6256d187a6d111a526f5d Subproject commit 385716865935081c00f8ebbc53ab2875aef4ef19