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 config tag and use findDependencies.pl from config tag #1265

Merged
merged 1 commit into from
Dec 19, 2014
Merged
Changes from all commits
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
5 changes: 2 additions & 3 deletions scram-project-build.file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Requires: SCRAMV1
%endif

%if "%{?configtag:set}" != "set"
%define configtag V05-03-28
%define configtag V05-04-00
%endif

%if "%{?useCmsTC:set}" != "set"
Expand Down Expand Up @@ -109,7 +109,6 @@ Source2: %{additionalSrc0}&output=/src1.tar.gz
%if "%{?additionalSrc1:set}" == "set"
Source3: %{additionalSrc1}&output=/src2.tar.gz
%endif
Source4: findDependencies.pl

%prep
rm -rf config
Expand Down Expand Up @@ -249,7 +248,7 @@ done

%if "%{?saveDeps:set}" == "set"
mkdir -p %i/etc/dependencies
perl %{_sourcedir}/findDependencies.pl -rel %i -arch %cmsplatf -scramroot $SCRAMV1_ROOT
perl %i/config/SCRAM/findDependencies.pl -rel %i -arch %cmsplatf -scramroot $SCRAMV1_ROOT
%{?PatchReleaseDependencyInfo:%PatchReleaseDependencyInfo}
gzip -f %i/etc/dependencies/*.out
%endif
Expand Down