Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Main Repositories
otb
Commits
a978f81e
Commit
a978f81e
authored
Sep 02, 2016
by
Rashad Kanavath
Browse files
JIRA: 1049. python bindings is .so in osx and linux
parent
11f9b50b
Changes
3
Hide whitespace changes
Inline
Side-by-side
SuperBuild/Packaging/Files/linux_pkgsetup.in
View file @
a978f81e
...
...
@@ -80,7 +80,7 @@ EOF
$CAT
>
$OUT_DIR
/otbenv.profile
<<
EOF
#!/bin/sh
PATH=
\$
PATH:
$OUT_DIR
/bin
PYTHONPATH=
\$
PYTHONPATH:
$OUT_DIR
/lib/python
PYTHONPATH=
$OUT_DIR
/lib/python
:
\$
PYTHONPATH
GDAL_DATA=
$OUT_DIR
/share/gdal
GEOTIFF_CSV=
$OUT_DIR
/share/espg_csv
...
...
@@ -91,6 +91,8 @@ export GEOTIFF_CSV
export PYTHONPATH
EOF
$CHMOD
+x
$OUT_DIR
/otbenv.profile
fi
#echo "Creating symbolic links..."
...
...
SuperBuild/Packaging/Files/macx_pkgsetup.in
View file @
a978f81e
...
...
@@ -12,7 +12,6 @@ CHMOD=`which chmod`
SED
=
`
which
sed
`
CP
=
`
which
cp
`
MKDIR
=
`
which
mkdir
`
WHICH_ENV
=
`
which
env
`
# find install_name_tool
INSTALL_NAME_TOOL
=
`
which install_name_tool
`
...
...
@@ -59,14 +58,14 @@ else
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleExecutable</key>
<string>STARTUP_FILE</string>
<key>CFBundleIconFile</key>
<string>Monteverdi.icns</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleExecutable</key>
<string>STARTUP_FILE</string>
<key>CFBundleIconFile</key>
<string>Monteverdi.icns</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleLongVersionString</key>
<string>LONG_VERSION</string>
<key>CFBundleShortVersionString</key>
...
...
@@ -76,7 +75,7 @@ else
EOF
$CAT
>
$OUT_DIR
/Mapla.app/Contents/MacOS/Mapla
<<
EOF
#!
$WHICH_ENV
ba
sh
#!
/bin/
sh
export LC_NUMERIC=C
export OTB_APPLICATION_PATH=
$OUT_DIR
/lib/otb/applications
export GDAL_DATA=
$OUT_DIR
/share/gdal
...
...
@@ -87,7 +86,7 @@ EOF
$CHMOD
+x
$OUT_DIR
/Mapla.app/Contents/MacOS/Mapla
$CAT
>
$OUT_DIR
/Monteverdi.app/Contents/MacOS/Monteverdi
<<
EOF
#!
$WHICH_ENV
ba
sh
#!
/bin/
sh
export LC_NUMERIC=C
export OTB_APPLICATION_PATH=
$OUT_DIR
/lib/otb/applications
export GDAL_DATA=
$OUT_DIR
/share/gdal
...
...
@@ -109,6 +108,22 @@ EOF
$SED
-i
""
"s,LONG_VERSION,
$LONG_VERSION_STRING
,g"
Monteverdi.app/Contents/Info.plist
$SED
-i
""
"s,SHORT_VERSION,
$SHORT_VERSION_STRING
,g"
Monteverdi.app/Contents/Info.plist
$CAT
>
$OUT_DIR
/otbenv.profile
<<
EOF
#!/bin/sh
PATH=
\$
PATH:
$OUT_DIR
/bin
PYTHONPATH=
$OUT_DIR
/lib/python:
\$
PYTHONPATH
GDAL_DATA=
$OUT_DIR
/share/gdal
GEOTIFF_CSV=
$OUT_DIR
/share/espg_csv
export LC_NUMERIC=C
export PATH
export GDAL_DATA
export GEOTIFF_CSV
export PYTHONPATH
EOF
$CHMOD
+x
$OUT_DIR
/otbenv.profile
fi
...
...
SuperBuild/Packaging/PackageHelper.cmake
View file @
a978f81e
...
...
@@ -554,10 +554,12 @@ function(func_prepare_package)
set
(
EXE_EXT
""
)
set
(
SCR_EXT
".sh"
)
set
(
LIB_EXT
".so"
)
set
(
PYMODULE_EXT
".so"
)
if
(
WIN32
)
set
(
EXE_EXT
".exe"
)
set
(
LIB_EXT
".dll"
)
set
(
SCR_EXT
".bat"
)
set
(
PYMODULE_EXT
".pyd"
)
set
(
DEST_LIB_DIR bin
)
elseif
(
APPLE
)
set
(
LIB_EXT
".dylib"
)
...
...
@@ -620,9 +622,8 @@ function(func_prepare_package)
endforeach
()
list
(
APPEND PKG_PEFILES
${
OTB_APPS_LIST
}
)
if
(
EXISTS
"
${
OTB_INSTALL_DIR
}
/lib/otb/python/_otbApplication
${
LIB_EXT
}
"
)
list
(
APPEND PKG_PEFILES
"
${
OTB_INSTALL_DIR
}
/lib/otb/python/_otbApplication
${
LIB_EXT
}
"
)
if
(
EXISTS
"
${
OTB_INSTALL_DIR
}
/lib/otb/python/_otbApplication
${
PYMODULE_EXT
}
"
)
list
(
APPEND PKG_PEFILES
"
${
OTB_INSTALL_DIR
}
/lib/otb/python/_otbApplication
${
PYMODULE_EXT
}
"
)
install
(
DIRECTORY
${
OTB_INSTALL_DIR
}
/lib/otb/python DESTINATION
${
PKG_STAGE_DIR
}
/lib
)
endif
()
...
...
@@ -1038,6 +1039,7 @@ set(APPLE_SYSTEM_DLLS
Carbon.framework
AppKit.framework
Foundation.framework
Python.framework
AGL.framework
OpenGL.framework
libgcc_s.*dylib
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment