Skip to content

Commit

Permalink
latest from coda-oss (#477)
Browse files Browse the repository at this point in the history
* coda-oss release 2022-05-03

* latest from coda-oss

* more updates from coda-oss

* fix build errors on Linux

* don't need VS UnitTest project

* latest from coda-oss
  • Loading branch information
J. Daniel Smith authored May 13, 2022
1 parent f27a389 commit 3e38c39
Show file tree
Hide file tree
Showing 75 changed files with 2,439 additions and 726 deletions.
107 changes: 55 additions & 52 deletions externals/coda-oss/.gitignore
Original file line number Diff line number Diff line change
@@ -1,52 +1,55 @@
*.swp
*~
*.pyc
__pycache__/
# Build artifacts

install/
install-*/
target/

# Conan
modules/drivers/**/build
test_package/build/

# CMake
_deps/
*.cmake
CMakeCache.txt
CMakeFiles/
*_config.h
Makefile
modules/**/Makefile
out/

# Waf
.waf-*
waf-*
.waf3-*
waf3-*
.lock-waf*
build/waf*/

# Eclipse
.project
.cproject

# Drivers
modules/drivers/fftw/fftw-2.1.*/
modules/drivers/jpeg/jpeg-9/
modules/drivers/jpeg/jpeg-9d/
modules/drivers/j2k/openjpeg/openjpeg-2.3.*_mod/
modules/drivers/pcre/pcre2-10.*/
modules/drivers/uuid/e2fsprogs-1.*-uuid/
modules/drivers/xml/xerces/xerces-c-*/
modules/drivers/zlib/zlib-1.2.*/

# VS
.vs/
project.sln
.depproj/

CMakeSettings.json
*.swp
*~
*.pyc
__pycache__/
# Build artifacts

install/
install-*/
target/

# Conan
modules/drivers/**/build
test_package/build/

# CMake
_deps/
*.cmake
CMakeCache.txt
CMakeFiles/
*_config.h
Makefile
modules/**/Makefile
out/

# Waf
.waf-*
waf-*
.waf3-*
waf3-*
.lock-waf*
build/waf*/

# Eclipse
.project
.cproject

# Drivers
modules/drivers/fftw/fftw-2.1.*/
modules/drivers/jpeg/jpeg-9/
modules/drivers/jpeg/jpeg-9d/
modules/drivers/j2k/openjpeg/openjpeg-2.3.*_mod/
modules/drivers/pcre/pcre2-10.*/
modules/drivers/uuid/e2fsprogs-1.*-uuid/
modules/drivers/xml/xerces/xerces-c-*/
modules/drivers/zlib/zlib-1.2.*/

# VS
.vs/
project.sln
.depproj/
*.tlog
**/x64/
*.vcxproj.user

CMakeSettings.json
6 changes: 3 additions & 3 deletions externals/coda-oss/build/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -672,11 +672,11 @@ def getPlatform(pwd=None, default=None):
for loc in locs:
if not exists(loc): continue
try:
out = subprocess.Popen('chmod +x %s' % loc, shell=True)
out = subprocess.Popen('chmod +x %s' % loc, shell=True, universal_newlines=True)
out.close()
except:{}
try:
out = subprocess.Popen(loc, shell=True, stdout=PIPE).stdout
out = subprocess.Popen(loc, shell=True, stdout=subprocess.PIPE, universal_newlines=True).stdout
platform = out.readline()
platform = platform.strip('\n')
out.close()
Expand Down Expand Up @@ -1678,7 +1678,7 @@ def getSolarisFlags(compilerName):
# If they don't, default to the old -xtarget flags
# TODO: Is there a cleaner way to do this with check_cc() instead?
bitFlag64 = '-xtarget=generic64'
(out, err) = subprocess.Popen([compilerName, '-flags'], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
(out, err) = subprocess.Popen([compilerName, '-flags'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True).communicate()

for line in out.split('\n'):
if re.match(r'-m64.*', line):
Expand Down
504 changes: 504 additions & 0 deletions externals/coda-oss/modules/c++/coda-oss-lite.vcxproj

Large diffs are not rendered by default.

Loading

0 comments on commit 3e38c39

Please sign in to comment.