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

new external starlight added #2114

Merged
merged 2 commits into from Feb 1, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions cmssw-tool-conf.spec
Expand Up @@ -8,6 +8,7 @@
%define isamd64 %(case %{cmsplatf} in (*amd64*) echo 1 ;; (*) echo 0 ;; esac)
%define isslc %(case %{cmsplatf} in (slc*) echo 1 ;; (*) echo 0 ;; esac)

Requires: starlight-toolfile
Requires: alpgen-toolfile
Requires: boost-toolfile
Requires: bz2lib-toolfile
Expand Down
25 changes: 25 additions & 0 deletions starlight-toolfile.spec
@@ -0,0 +1,25 @@
### RPM external starlight-toolfile 1.0
Requires: starlight

%prep

%build

%install
mkdir -p %{i}/etc/scram.d
cat << \EOF_TOOLFILE >%{i}/etc/scram.d/starlight.xml
<tool name="starlight" version="@TOOL_VERSION@">
<lib name="Starlib"/>
<client>
<environment name="STARLIGHT_BASE" default="@TOOL_ROOT@"/>
<environment name="LIBDIR" default="$STARLIGHT_BASE/lib"/>
<environment name="INCLUDE" default="$STARLIGHT_BASE/include"/>
</client>
<runtime name="PATH" value="$STARLIGHT_BASE/bin" type="path"/>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
<use name="clhep"/>
</tool>
EOF_TOOLFILE

## IMPORT scram-tools-post
33 changes: 33 additions & 0 deletions starlight.spec
@@ -0,0 +1,33 @@
### RPM external starlight r193
Requires: clhep

%define branch cms/%{realversion}
%define github_user cms-externals
%define tag 3c3e91b8fe2c6a265f3ace4bc08fac4184d2490b
Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz

BuildRequires: cmake

%prep
%setup -n %{n}-%{realversion}

%build
rm -rf ../build
mkdir ../build
cd ../build

export CLHEP_PARAM_PATH=${CLHEP_ROOT}

cmake ../%{n}-%{realversion} \
-DCMAKE_INSTALL_PREFIX:PATH="%{i}" \
-DCMAKE_BUILD_TYPE=Realease \
-DENABLE_CLHEP=ON

make %{makeprocesses} VERBOSE=1

%install
cd ../build
make %{makeprocesses} install VERBOSE=1

rm -rf %{i}/lib/archive
rm -rf %{i}/lib/libStarlib.a
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this line, there is no such file.

a/slc6_amd64_gcc493/external/starlight/r193-cms/lib
a/slc6_amd64_gcc493/external/starlight/r193-cms/lib/libStarlib.so
a/slc6_amd64_gcc493/external/starlight/r193-cms/lib/archive
a/slc6_amd64_gcc493/external/starlight/r193-cms/lib/archive/libStarlib.a

Other than that, LGTM.