Skip to content
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.

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

[ACE 6] Added a script install_proj.sh that can be used to run make install #2174

Merged
merged 1 commit into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions ACE/ACE-INSTALL.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ <h2>Synopsis</h2>
<li><a href="#eclipse">Working with ACE in Eclipse</a></li>
<li><a href="#advanced">Advanced Topics</a></li>
<li><a href="#power">Building from git</a></li>
</li></ul>
</ul>


<p></p><hr><p>
Expand Down Expand Up @@ -332,7 +332,7 @@ <h3><a name="unix_traditional">Using the Traditional ACE/GNU Configuration</a></
source tree. The ACE recursive Makefile scheme needs this information.
There are several ways to set the ACE_ROOT variable. For example:
<blockquote>
TSCH/CSH:
TCSH/CSH:
<code>setenv ACE_ROOT /home/cs/faculty/schmidt/ACE_wrappers</code>
</blockquote>
<blockquote>
Expand Down Expand Up @@ -430,6 +430,9 @@ <h3><a name="unix_traditional">Using the Traditional ACE/GNU Configuration</a></
</li>
<li>If you've set the INSTALL_PREFIX before building, now run
<blockquote><code>% make install</code></blockquote>
<p>An alternative to directly running <code>make install</make> is to use <code>$ACE_ROOT/bin/install_proj.sh</code>
which will only install projects that are built (instead of trying to build each one during <code>make install</code>).
</p>
</li>
<li>If you need to regenerate the <code>ace/Svc_Conf_y.cpp</code> file,
you'll need to
Expand Down Expand Up @@ -2712,7 +2715,7 @@ <h2><a name="g++">Compiling ACE with GNU g++</a></h2>
If you use the GNU GCC g++ compiler please note the following:

<ul>
</p></li><li>ACE/TAO needs g++ 2.95.x or better. Older versions are not usable anymore<p>
</p><li>ACE/TAO needs g++ 2.95.x or better. Older versions are not usable anymore<p>

</p></li><li>Make sure to update your gcc <code>config.status</code>
file. This file is produced when installing gcc; it specifies
Expand Down
15 changes: 15 additions & 0 deletions ACE/bin/install_proj.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
include $(PROJECT_MAKEFILE)

POTENTIAL_FILES = $(BIN_UNCHECKED) $(SHLIB_UNCHECKED) $(LIB_UNCHECKED)
ACTUAL_FILES := $(wildcard $(POTENTIAL_FILES))

.PHONY: checked-install
ifeq ($(ACTUAL_FILES),)
checked-install:
@echo Skipping $(PROJECT_MAKEFILE:GNUmakefile.%=%), not built
else
.PHONY: checked-install-message
checked-install-message:
@echo Installing $(ACTUAL_FILES)
checked-install: checked-install-message install
endif
13 changes: 13 additions & 0 deletions ACE/bin/install_proj.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh

# ACE's "make install" for an MPC-generated workspace will build all targets that aren't yet built
# This script looks for projects that have been built and installs just those projects
this_dir=$(realpath $(dirname $0))
for makefile in $(find . -type f -name 'GNUmakefile.*'); do
if grep -q 'GNU Makefile' $makefile; then
echo Checking $makefile
cd $(dirname $makefile)
make -f $this_dir/install_proj.mk PROJECT_MAKEFILE=$(basename $makefile) checked-install "$@"
cd - >/dev/null
fi
done
Loading