Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
moose
Manage
Activity
Members
Labels
Plan
Issues
9
Issue boards
Milestones
Wiki
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sahil Moza
moose
Commits
25e069db
Commit
25e069db
authored
7 years ago
by
Dilawar Singh
Browse files
Options
Downloads
Patches
Plain Diff
Use bdist instead of install for creating binay distrution. During installation,
untar this to destination.
parent
b09a3ba2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+3
-2
3 additions, 2 deletions
CMakeLists.txt
cmake/build_moose-core.sh.in
+15
-17
15 additions, 17 deletions
cmake/build_moose-core.sh.in
moose-core/CMakeLists.txt
+17
-0
17 additions, 0 deletions
moose-core/CMakeLists.txt
with
35 additions
and
19 deletions
CMakeLists.txt
+
3
−
2
View file @
25e069db
...
...
@@ -60,9 +60,10 @@ set(PYMOOSE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/moose-core")
set
(
PYMOOSE_BUILD_DIR
${
CMAKE_BINARY_DIR
}
/__moose-core_build
)
# NOTE: new setuptools does not install python module to this directory unless
# i
t supports .pth file or PYTHONPATH points to it. Make sure when moose-core is
#
installing into user_specified path, set PYTHONPATH
to this directory.
# i
nstalling into user_specified path, set PYTHONPATH to this directory. We now
#
create a bdist
to this directory.
set
(
PYMOOSE_INSTALL_DIR
${
CMAKE_BINARY_DIR
}
/__moose-core_install
)
set
(
PYMOOSE_BDIST_DIR
${
PYMOOSE_BUILD_DIR
}
/
)
if
(
WITH_GUI
)
set
(
MOOSE_GUI_DIR
${
CMAKE_SOURCE_DIR
}
/moose-gui
)
...
...
This diff is collapsed.
Click to expand it.
cmake/build_moose-core.sh.in
+
15
−
17
View file @
25e069db
...
...
@@ -11,20 +11,18 @@ if [ -z "$MAKE" ]; then
MAKE
=
make
fi
echo
"Building MOOSE"
(
export
GSL_ROOT_DIR
=
@GSL_ROOT_DIR@
export
HDF5_ROOT
=
@HDF5_ROOT@
cd
@PYMOOSE_BUILD_DIR@
cmake
-DCMAKE_INSTALL_PREFIX
=
@PYMOOSE_INSTALL_DIR@
\
-DCMAKE_BUILD_TYPE
=
Release
\
-DWITH_BOOST
=
@WITH_BOOST@
\
-DPYTHON_EXECUTABLE
=
@PYTHON_EXECUTABLE@
\
-DVERSION_MOOSE
=
@MOOSE_VERSION@
\
@CMAKE_PYMOOSE_ARGS@
\
@PYMOOSE_SOURCE_DIR@
$MAKE
ctest
-output-on-failure
||
echo
"Some tests failed"
$MAKE
install
)
echo
"Building pymoose and creating bdist."
export
GSL_ROOT_DIR
=
@GSL_ROOT_DIR@
export
HDF5_ROOT
=
@HDF5_ROOT@
cd
@PYMOOSE_BUILD_DIR@
cmake
-DCMAKE_INSTALL_PREFIX
=
@PYMOOSE_INSTALL_DIR@
\
-DCMAKE_BUILD_TYPE
=
Release
\
-DWITH_BOOST
=
@WITH_BOOST@
\
-DPYTHON_EXECUTABLE
=
@PYTHON_EXECUTABLE@
\
-DVERSION_MOOSE
=
@MOOSE_VERSION@
\
-DPYMOOSE_BDIST_DIR
=
@PYMOOSE_BDIST_DIR@
\
@CMAKE_PYMOOSE_ARGS@
\
@PYMOOSE_SOURCE_DIR@
$MAKE
ctest
--output-on-failure
||
echo
"Some tests failed"
$MAKE
bdist
This diff is collapsed.
Click to expand it.
moose-core/CMakeLists.txt
+
17
−
0
View file @
25e069db
...
...
@@ -393,6 +393,7 @@ endif()
######################### BUILD PYMOOSE ########################################
add_subdirectory
(
pymoose
)
######################### INSTALL ##############################################
if
(
DEBUG
)
...
...
@@ -449,6 +450,22 @@ if(${CMAKE_BUILD_TOOL} MATCHES "make")
)
endif
()
# Target for creating bdist. This is handy for creating bdist for packaging.
# Save the binary distribution (tar.gz) to PYMOOSE_BDIST_DIR. Note that this
# target is only useful when creating packages on Open Build Service i.e. if you
# use this target on distribution X, it may not work on distrbutions other than
# X. See python-wheels for making portable distributions.
if
(
NOT PYMOOSE_BDIST_DIR
)
set
(
PYMOOSE_BDIST_DIR
${
CMAKE_BINARY_DIR
}
/pymoose_bdist
)
endif
(
)
add_custom_target
(
bdist
DEPENDS pymoose
COMMAND
${
PYTHON_EXECUTABLE
}
setup.cmake.py bdist -d
${
PYMOOSE_BDIST_DIR
}
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
/python
COMMENT
"Genearating bdist using setup.cmake.py."
VERBATIM
)
############################ CTEST ######################################
include
(
CTest
)
...
...
This diff is collapsed.
Click to expand it.
Preview
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!
Save comment
Cancel
Please
register
or
sign in
to comment