Skip to content

Version 1.3 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
c0diq wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Version 1.3 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d5a4dda
Increase project version to 1.3
c0diq Jul 24, 2019
9f8901a
Update Neptune to 6e0c0f45c7
c0diq Apr 2, 2020
cc73b60
Switch to python 3.8.1
c0diq Jul 1, 2020
49dd495
fix travis
c0diq Jul 1, 2020
9f0b70c
Python 3 fixes
c0diq Mar 15, 2021
5205261
Add back macOS scons file
c0diq Mar 15, 2021
1ca9c8c
Fix build
c0diq Mar 15, 2021
dc9c5dc
Fix other platforms
c0diq Mar 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ Build/Targets/x86-microsoft-win32-vs20*/*/Release
Build/Targets/arm-android-linux/Debug
Build/Targets/arm-android-linux/Release
Build/Targets/x86-unknown-linux/Debug
Build/Targets/arm-unknown-linux/Debug
IDEWorkspaceChecks.plist
1 change: 1 addition & 0 deletions .python-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.8.1
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ install: true
script: Scripts/cibuild
deploy:
provider: releases
api_key:
secure: yAw9fBdYC32YRpzaVIyAMXX5OMDG/+O4pTq8HwH7KmdWakbOSdoFzIWnSZnNc2SAB3DdGNcON26y9ZltIWokpN5Nc5KWhjR9bqzPitOANW8w+rc5AdAE9PcnI4KYjfWPOYAAlbtGBzHyxjcztzYdp8WgHAYVeRrDVqEDRanHo1qSbctoTI4qDe7tRr+Lnk2+yYlH4IvvQHAQeR+lWoMKTybxMLo5uSHee60XNpeFSEPpPm3OeR8yy20eLMGacDCq26//u2uEqJlzjwHjEbxWP7vFCVd4TshbiP2Oe1FuO/BHd9WjLaenaguIemvIMNuLtMuysbVa2TLguJQK0DyrwMpRPazpDMgo9HhbyNsDQd/tnkTWeLpTfyxf8KZUqb/m0hprN4GFiQ3ELRClPgw6y8q1nc5jxnh1Eg4IgrjZGxmA0A7GqFtfxtUFBY0lAkpFQUa1++Urul9SECZ/wiVKsk5u+44YwN1ouX+8uJM6JdY/kp82JYujHCihLSmd6qDUD4eGv+rW4S4ac7hzlxuffjWP1WeZw9KOYsYG6LM8P/YfhZ1N2aaVh9oedj/NRJkJV2wL28CBkEINsnAHZW5vrFmCIq+zWp8h+uk406O1mn/YSfBjEnbdnpyY0yz+65GLagUBN5QP7OJ0JMXjQTrstYSc67aWOTgVE4jOrmRHZLU=
api_key: "$GITHUB_OAUTH_TOKEN"
file: Neptune.framework.zip
skip_cleanup: true
on:
Expand Down
4 changes: 2 additions & 2 deletions Build/Boot.scons
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def DefaultTarget():
if (platform.machine().startswith('arm')):
platform_id = 'linux-arm'

if PLATFORM_TO_TARGET_MAP.has_key(platform_id):
if platform_id in PLATFORM_TO_TARGET_MAP:
return PLATFORM_TO_TARGET_MAP[platform_id]
else:
return None
Expand All @@ -62,5 +62,5 @@ base_env = env
for build_config in env['build_config']:
env = base_env.Clone()
env['build_config'] = build_config
print '********** Configuring Build Target =', env['target'], '/', build_config, '********'
print('********** Configuring Build Target =', env['target'], '/', build_config, '********')
SConscript('Build.scons', variant_dir='Targets/'+env['target']+'/'+build_config, exports='env', duplicate=0)
8 changes: 4 additions & 4 deletions Build/Build.scons
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def DeclareBuildDir(dir):
def GetIncludeDirs(modules, exclude=None):
dirs = []
for module in Split(modules):
if Modules.has_key(module) and not module == exclude:
if module in Modules and not module == exclude:
dirs += Modules[module].GetIncludeDirs()
else:
dirs += [GetDirPath(module)]
Expand All @@ -44,7 +44,7 @@ def GetIncludeDirs(modules, exclude=None):
def GetLibraries(modules):
libs = []
for module in Split(modules):
if Modules.has_key(module):
if module in Modules:
libs += Modules[module].GetLibraries()
else:
libs += [module]
Expand Down Expand Up @@ -139,7 +139,7 @@ def Application(name, dir):
GlobSources(dir, ['*.c', '*.cpp']) + env['NPT_EXTRA_EXECUTABLE_OBJECTS'],
LIBS=libs, CPPPATH=cpp_path)
#env.Alias(name, prog)
if env.has_key('NPT_EXECUTABLE_POST_PROCESSOR'):
if 'NPT_EXECUTABLE_POST_PROCESSOR' in env:
env.AddPostAction(prog, env['NPT_EXECUTABLE_POST_PROCESSOR'])

#######################################################
Expand All @@ -160,7 +160,7 @@ else:
target_config_file = env.GetBuildPath('#/Build/Targets/'+env['target']+'/Config.scons')
if os.path.exists(target_config_file):
# Load the target-specific config file
execfile(target_config_file)
exec(open(target_config_file).read())

#######################################################
# modules
Expand Down
2 changes: 1 addition & 1 deletion Build/Targets/any-blackberry-qnx/Config.scons
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ env['ENV']['QNX_HOST'] = os.environ['QNX_HOST']
env['ENV']['QNX_TARGET'] = os.environ['QNX_TARGET']

### Neptune System Files
env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullSerialPort.cpp'}
env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullAutoreleasePool.cpp NptNullSerialPort.cpp'}
env['NPT_EXTRA_LIBS']=['m', 'socket']
2 changes: 1 addition & 1 deletion Build/Targets/any-google-pnacl/Config.scons
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ env['RANLIB'] = 'pnacl-ranlib'
env['AR'] = 'pnacl-ar'

### Neptune System Files
env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Posix':'NptPosixThreads.cpp NptPosixSystem.cpp', 'System/Nacl':'*.cpp', 'System/Null':'NptNullSerialPort.cpp'}
env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Posix':'NptPosixThreads.cpp NptPosixSystem.cpp', 'System/Nacl':'*.cpp', 'System/Null':'NptNullAutoreleasePool.cpp NptNullSerialPort.cpp'}
env['NPT_EXTRA_LIBS']=['m', 'pthread']
2 changes: 1 addition & 1 deletion Build/Targets/mipsel-sigma-linux/Config.scons
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
LoadTool('gcc-generic', env, gcc_cross_prefix='mipsel-linux')

### Neptune System Files
env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullSerialPort.cpp'}
env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullAutoreleasePool.cpp NptNullSerialPort.cpp'}
env['NPT_EXTRA_LIBS']=['pthread']
5 changes: 5 additions & 0 deletions Build/Targets/universal-apple-macosx/Config.scons
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
LoadTool('gcc-generic', env)

### Neptune System Files
env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullAutoreleasePool.cpp NptNullSerialPort.cpp'}
env['NPT_EXTRA_LIBS']=['pthread']
20 changes: 14 additions & 6 deletions Build/Targets/universal-apple-macosx/Neptune.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@
CA1A5EB80EC0155300A9040C /* rc4.c in Sources */ = {isa = PBXBuildFile; fileRef = CA1A5E700EC0145900A9040C /* rc4.c */; };
CA1A5EBA0EC0155400A9040C /* p12.c in Sources */ = {isa = PBXBuildFile; fileRef = CA1A5E7D0EC0145900A9040C /* p12.c */; };
CA1A5EBE0EC0155700A9040C /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = CA1A5E6F0EC0145900A9040C /* md5.c */; };
CA1A5EBF0EC0155800A9040C /* md2.c in Sources */ = {isa = PBXBuildFile; fileRef = CA1A5E6E0EC0145900A9040C /* md2.c */; };
CA1A5EC00EC0155900A9040C /* loader.c in Sources */ = {isa = PBXBuildFile; fileRef = CA1A5E790EC0145900A9040C /* loader.c */; };
CA1A5EC10EC0155900A9040C /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = CA1A5E6D0EC0145900A9040C /* hmac.c */; };
CA1A5EC20EC0155A00A9040C /* gen_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = CA1A5E780EC0145900A9040C /* gen_cert.c */; };
Expand Down Expand Up @@ -273,6 +272,9 @@
E44E2B141AE75CD20092347B /* NptTlsDefaultTrustAnchorsBase.h in Headers */ = {isa = PBXBuildFile; fileRef = E40D8D671ADB808A0041A617 /* NptTlsDefaultTrustAnchorsBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
E44E2B151AE75CD20092347B /* NptTlsDefaultTrustAnchorsExtended.h in Headers */ = {isa = PBXBuildFile; fileRef = E40D8D681ADB808A0041A617 /* NptTlsDefaultTrustAnchorsExtended.h */; settings = {ATTRIBUTES = (Public, ); }; };
E44E2B161AE75CD20092347B /* NptZip.h in Headers */ = {isa = PBXBuildFile; fileRef = CA84EC7A0C7E5A7000CC9622 /* NptZip.h */; settings = {ATTRIBUTES = (Public, ); }; };
E46C9C842436A7CC000B66AD /* sha256.c in Sources */ = {isa = PBXBuildFile; fileRef = E46C9C812436A7CC000B66AD /* sha256.c */; };
E46C9C852436A7CC000B66AD /* sha384.c in Sources */ = {isa = PBXBuildFile; fileRef = E46C9C822436A7CC000B66AD /* sha384.c */; };
E46C9C862436A7CC000B66AD /* sha512.c in Sources */ = {isa = PBXBuildFile; fileRef = E46C9C832436A7CC000B66AD /* sha512.c */; };
E4AD606F22E6DC6C00F9FE08 /* libaxTLS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CA1A5EA90EC0152A00A9040C /* libaxTLS.a */; };
E4AD607C22E6F3D900F9FE08 /* Neptune.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E44E2B1B1AE75CD20092347B /* Neptune.framework */; };
E4AD607D22E6F3DE00F9FE08 /* Neptune.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E44E2B1B1AE75CD20092347B /* Neptune.framework */; };
Expand Down Expand Up @@ -613,7 +615,6 @@
CA1A5E6B0EC0145900A9040C /* crypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto.h; sourceTree = "<group>"; };
CA1A5E6C0EC0145900A9040C /* crypto_misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypto_misc.c; sourceTree = "<group>"; };
CA1A5E6D0EC0145900A9040C /* hmac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hmac.c; sourceTree = "<group>"; };
CA1A5E6E0EC0145900A9040C /* md2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = md2.c; sourceTree = "<group>"; };
CA1A5E6F0EC0145900A9040C /* md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = md5.c; sourceTree = "<group>"; };
CA1A5E700EC0145900A9040C /* rc4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rc4.c; sourceTree = "<group>"; };
CA1A5E710EC0145900A9040C /* rsa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rsa.c; sourceTree = "<group>"; };
Expand Down Expand Up @@ -773,6 +774,9 @@
E40D8D671ADB808A0041A617 /* NptTlsDefaultTrustAnchorsBase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NptTlsDefaultTrustAnchorsBase.h; sourceTree = "<group>"; };
E40D8D681ADB808A0041A617 /* NptTlsDefaultTrustAnchorsExtended.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NptTlsDefaultTrustAnchorsExtended.h; sourceTree = "<group>"; };
E44E2B1B1AE75CD20092347B /* Neptune.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Neptune.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E46C9C812436A7CC000B66AD /* sha256.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha256.c; sourceTree = "<group>"; };
E46C9C822436A7CC000B66AD /* sha384.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha384.c; sourceTree = "<group>"; };
E46C9C832436A7CC000B66AD /* sha512.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha512.c; sourceTree = "<group>"; };
E4AD607522E6E93800F9FE08 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
E4AD607722E6E94800F9FE08 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
F912B6B00B8EB27400C1E90D /* Neptune.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Neptune.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1219,14 +1223,16 @@
CA1A5E650EC0145900A9040C /* crypto */ = {
isa = PBXGroup;
children = (
E46C9C812436A7CC000B66AD /* sha256.c */,
E46C9C822436A7CC000B66AD /* sha384.c */,
E46C9C832436A7CC000B66AD /* sha512.c */,
CA1A5E670EC0145900A9040C /* aes.c */,
CA1A5E680EC0145900A9040C /* bigint.c */,
CA1A5E690EC0145900A9040C /* bigint.h */,
CA1A5E6A0EC0145900A9040C /* bigint_impl.h */,
CA1A5E6B0EC0145900A9040C /* crypto.h */,
CA1A5E6C0EC0145900A9040C /* crypto_misc.c */,
CA1A5E6D0EC0145900A9040C /* hmac.c */,
CA1A5E6E0EC0145900A9040C /* md2.c */,
CA1A5E6F0EC0145900A9040C /* md5.c */,
CA1A5E700EC0145900A9040C /* rc4.c */,
CA1A5E710EC0145900A9040C /* rsa.c */,
Expand Down Expand Up @@ -2809,14 +2815,16 @@
CA1A5EB80EC0155300A9040C /* rc4.c in Sources */,
CA1A5EBA0EC0155400A9040C /* p12.c in Sources */,
CA1A5EBE0EC0155700A9040C /* md5.c in Sources */,
CA1A5EBF0EC0155800A9040C /* md2.c in Sources */,
E46C9C862436A7CC000B66AD /* sha512.c in Sources */,
CA1A5EC00EC0155900A9040C /* loader.c in Sources */,
CA1A5EC10EC0155900A9040C /* hmac.c in Sources */,
CA1A5EC20EC0155A00A9040C /* gen_cert.c in Sources */,
CA1A5EC40EC0155B00A9040C /* crypto_misc.c in Sources */,
CA1A5ECA0EC0156000A9040C /* bigint.c in Sources */,
CA1A5ECB0EC0156100A9040C /* asn1.c in Sources */,
E46C9C842436A7CC000B66AD /* sha256.c in Sources */,
CA1A5ECC0EC0156100A9040C /* aes.c in Sources */,
E46C9C852436A7CC000B66AD /* sha384.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -5002,7 +5010,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 1.3;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -5083,7 +5091,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 1.3;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down
2 changes: 1 addition & 1 deletion Build/Targets/x86-unknown-cygwin/Config.scons
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LoadTool('gcc-generic', env)

### Neptune System Files
env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullSerialPort.cpp'}
env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullAutoreleasePool.cpp NptNullSerialPort.cpp'}
2 changes: 1 addition & 1 deletion Build/Targets/x86_64-unknown-linux/Config.scons
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
LoadTool('gcc-generic', env)

### Neptune System Files
env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullSerialPort.cpp'}
env['NPT_SYSTEM_SOURCES']={'System/StdC':'*.cpp', 'System/Bsd':'*.cpp', 'System/Posix':'*.cpp', 'System/Null':'NptNullAutoreleasePool.cpp NptNullSerialPort.cpp'}
env['NPT_EXTRA_LIBS']=['pthread']
if env['shared']:
env['NPT_EXTRA_LIBS'] += ['dl']
Loading