-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
8e598b2 Merge pull request #152 from mdaus/sync_externals db2bd21 Replace header 8c23930 Merge commit '5049aeb61891a8297c756b27841e2f227fe961f7' into sync_externals 5049aeb Squashed 'externals/coda-oss/' changes from 0efc30c..d5dafc3 6903461 Merge pull request #151 from mdaus/sync_externals 91e7d1a Squashed 'externals/coda-oss/' changes from 4995c9e..0efc30c 7360c64 Merge commit '91e7d1ae2034a182b88c3700fe83a1e4e6cf1f7d' into sync_externals abe6ee5 Merge pull request #150 from mdaus/remove_test_warnings c7d92fa Remove warnings 64fa972 Merge pull request #149 from mdaus/shared_build_fix e8abef5 Merge pull request #148 from mdaus/sync_externals 8575413 Build CGM f266587 Cleanup d248ef3 Add VS dirs to gitignore 75022cb Cleanup a6f5d69 Cleanup d30fb8a Fix indentation 346236c Merge commit '24048fe232bca15801857cf5a2de1f703155cf77' into sync_externals 24048fe Squashed 'externals/coda-oss/' changes from eee482d..4995c9e 8e05b64 Add jpeg shared library 7c87020 Build DLL for j2k ff1462a Merge pull request #147 from mdaus/sync_externals 373cbaf Squashed 'externals/coda-oss/' changes from 7e0a53e..eee482d 218e877 Merge commit '373cbaf9b839f6d7c1bcda12c299bfbbf8e400c0' into sync_externals a863cf0 Merge pull request #146 from mdaus/fix_multiband_nitfs 09da561 Clean up tests bee1c81 Fix copy/paste bug; add test for 16bpp data 04afc7d Merge pull request #145 from mdaus/fix_multiband_nitfs de2a8b2 Strip trailing whitespace e4d655e Cleanup 1f646f6 Enforce band order c9d7b87 Old C limitations ffdf6ed More failing test cases 7d38397 Make fewer assumptions about bandlist order bbaadc5 Finish fixing Multiband P read d19069f Quick workaround for testing cb7091e Fix test; add failing test for buggy case 614c607 Fix formatting and tests eab11fa Merge branch 'fix_multiband_nitfs' of https://github.com/mdaus/nitro into fix_multiband_nitfs 263824f Draft failing test and regression test c4f861d Misc cleanups 69aab7b Merge pull request #143 from mdaus/fix_multiband_nitfs 9eff3a1 Regenerate Python bindings; rename test with name conflict 5382800 Disallow direct block write for multiband images bbd316f Handle unexpected block size 4d15605 Merge pull request #142 from mdaus/sync_externals b9fb90d Squashed 'externals/coda-oss/' changes from dbabd95d..7e0a53e4 253b036 Merge commit 'b9fb90dcae51d25cd6cb0b3ec7f9cf514d09da8f' into sync_externals a9a86b1 Merge pull request #138 from mdaus/sync_externals 18fc2b8 Squashed 'externals/coda-oss/' changes from 163168f..dbabd95 50a541f Merge commit '18fc2b8147553d0fbf899faa79739242132bde4d' into sync_externals git-subtree-dir: externals/nitro git-subtree-split: 8e598b2
- Loading branch information
1 parent
255f509
commit af94235
Showing
88 changed files
with
3,652 additions
and
1,215 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ | |
|
|
||
| # Build artifacts | ||
|
|
||
| install/ | ||
| target/ | ||
|
|
||
| # Waf | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| This module represents the "configure" step for the entire C++ set of libraries. | ||
| It exists independently to ensure it can always build first with no | ||
| circular dependencies. Its sole responsibility is to generate "coda_oss_config.h" | ||
|
|
||
| Key defines in "coda_oss_config.h": | ||
| - CODA_EXPORT: Expands to __declspec(dllexport) when building | ||
| shared libraries on Windows | ||
|
|
||
| - __CODA_CPP11: Defined if the library is compiled with C++11 support |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| NAME = 'config' | ||
| MAINTAINER = '[email protected]' | ||
| VERSION = '1.2' | ||
| USELIB = 'THREAD DL RT SOCKET' | ||
|
|
||
| import os | ||
| from build import writeConfig | ||
| from waflib import Utils | ||
|
|
||
| options = distclean = lambda p: None | ||
|
|
||
| def configure(conf): | ||
| # this check defines HAVE_CLOCK_GETTIME, undefine it to keep it out of dumpenv | ||
| if conf.check_cc(lib='rt', uselib_store='RT', function_name='clock_gettime', header_name='time.h', mandatory=False): | ||
| conf.undefine('HAVE_CLOCK_GETTIME') | ||
|
|
||
| # callback function to check for all #defines used by the sys module | ||
| def sys_callback(conf): | ||
| conf.check_cc(header_name='pthread.h', mandatory=False) | ||
| conf.check_cc(header_name='execinfo.h', mandatory=False) | ||
| conf.check_cc(function_name='clock_gettime', header_name='time.h', mandatory=False) | ||
| conf.check_cc(header_name="atomic.h", mandatory=False) | ||
| conf.check_cc(header_name="sys/time.h", mandatory=False) | ||
| conf.check_cc(function_name='localtime_r', header_name="time.h", mandatory=False) | ||
| conf.check_cc(function_name='gmtime_r', header_name="time.h", mandatory=False) | ||
| conf.check_cc(function_name='setenv', header_name="stdlib.h", mandatory=False) | ||
| conf.check_cc(function_name='posix_memalign', header_name="stdlib.h", mandatory=False) | ||
| conf.check_cc(function_name='memalign', header_name="stdlib.h", mandatory=False) | ||
| types_str = ''' | ||
| #include <stdio.h> | ||
| int isBigEndian() | ||
| { | ||
| long one = 1; | ||
| return !(*((char *)(&one))); | ||
| } | ||
| int main() | ||
| { | ||
| if (isBigEndian()) printf("bigendian=True\\n"); | ||
| else printf("bigendian=False\\n"); | ||
| printf("sizeof_size_t=%d\\n", sizeof(size_t)); | ||
| return 0; | ||
| } | ||
| ''' | ||
|
|
||
| # Visual Studio 2013 has nullptr but not constexpr. Need to check for | ||
| # both in here to make sure we have full C++11 support... otherwise, | ||
| # long-term we may need multiple separate configure checks and | ||
| # corresponding defines | ||
| cpp11_str = ''' | ||
| int main() | ||
| { | ||
| constexpr void* FOO = nullptr; | ||
| } | ||
| ''' | ||
| #find out the size of some types, etc. | ||
| # TODO: This is not using the 32 vs. 64 bit linker flags, so if you're | ||
| # building with --enable-32bit on 64 bit Linux, sizeof(size_t) will | ||
| # erroneously be 8 here. | ||
| output = conf.check(fragment=types_str, execute=1, msg='Checking system type sizes', define_ret=True) | ||
| t = Utils.str_to_dict(output or '') | ||
| for k, v in t.items(): | ||
| try: | ||
| v = int(v) | ||
| except: | ||
| v = v.strip() | ||
| if v == 'True': | ||
| v = True | ||
| elif v == 'False': | ||
| v = False | ||
| conf.define(k.upper(), v) | ||
| conf.check_cxx(fragment=cpp11_str, | ||
| execute=1, | ||
| msg='Checking for C++11 support', | ||
| define_name='__CODA_CPP11', | ||
| mandatory=True) | ||
| conf.define('CODA_EXPORT', conf.env['declspec_decoration'], quote=False) | ||
|
|
||
| writeConfig(conf, sys_callback, 'coda_oss', | ||
| path=os.path.join('include', 'config'), | ||
| outfile='coda_oss_config.h') | ||
|
|
||
|
|
||
| def build(bld): | ||
| includeDirname = os.path.join(bld.env['install_includedir'], 'config') | ||
| configPathname = bld.path.get_bld().ant_glob('**/coda_oss_config.h') | ||
| bld.install_files(dest=includeDirname, | ||
| files=configPathname) | ||
| bld.module(**globals()) |
Oops, something went wrong.