Skip to content

Test pull request #256

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.

Sign up for GitHub

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

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Test pull request #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
cc1d0bf
Merge branch 'hotfix-v3.2.2+1'
swells Oct 8, 2015
8cb70f2
Update hard coded RPM_NAMES to dynamic strings
nathansoz Nov 6, 2015
696ee10
Add requirements to R spec file
nathansoz Nov 10, 2015
b9608f1
Merge pull request #247 from RevolutionAnalytics/rich-rebrand-1
nathansoz Nov 11, 2015
6e59585
Update iterators, foreach, and doParallel version numbers.
nathansoz Nov 11, 2015
755157d
Update windows package versions.
nathansoz Nov 11, 2015
9b68278
Correct one missed RRO to MRO
nathansoz Nov 11, 2015
946d853
Remove cairo-devel requirement and change to cairo. Add zip requirement
nathansoz Nov 23, 2015
6cce075
Add zip requirement to sles10
nathansoz Nov 23, 2015
872fab1
Add zip to sles11 requirements
nathansoz Nov 23, 2015
3278db2
test jenkinsfile
nathansoz Dec 17, 2015
aedefa9
Merge branch 'jenkins-test' of https://github.com/RevolutionAnalytics…
Dec 17, 2015
bcfeff6
Adding windows build to Jenkinsfile
Dec 17, 2015
dc15ea7
Update Jenkinsfile
nathansoz Dec 17, 2015
88f331f
Update Jenkinsfile
nathansoz Dec 17, 2015
df01b82
Update Jenkinsfile
nathansoz Dec 17, 2015
4eeec60
Update Jenkinsfile
nathansoz Dec 18, 2015
8baee62
Update Jenkinsfile
nathansoz Dec 18, 2015
90591a8
Update Jenkinsfile
nathansoz Dec 18, 2015
584e8d3
Update Jenkinsfile
nathansoz Dec 21, 2015
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
28 changes: 28 additions & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
parallel centos_build: {
node('centos6') {
checkout scm
sh './build.sh'
step([$class: 'ArtifactArchiver', artifacts: '**/*.rpm', fingerprint: true])
}
},
centos5_build: {
node('centos5') {
checkout scm
sh './build.sh'
step([$class: 'ArtifactArchiver', artifacts: '**/*.rpm', fingerprint: true])
}
},
sles11_build: {
node('suse11') {
checkout scm
sh './build.sh'
step([$class: 'ArtifactArchiver', artifacts: '**/*.rpm', fingerprint: true])
}
},
mac_build: {
node('mac_os_x') {
checkout scm
sh 'pushd RRO-src/OSX && ./build-OSX.sh'
step([$class: 'ArtifactArchiver', artifacts: '**/*.pkg', fingerprint: true])
}
}
6 changes: 3 additions & 3 deletions RRO-src/buildFiles/packages-linux-connector.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"packages": [
{ "name": "iterators", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/iterators_1.0.7.tar.gz", "destFileName": "iterators_1.0.7.tar.gz" },
{ "name": "foreach", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/foreach_1.4.2.tar.gz", "destFileName": "foreach_1.4.2.tar.gz" },
{ "name": "doParallel", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/doParallel_1.0.8.tar.gz", "destFileName": "doParallel_1.0.8.tar.gz" },
{ "name": "iterators", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/iterators_1.0.8.tar.gz", "destFileName": "iterators_1.0.8.tar.gz" },
{ "name": "foreach", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/foreach_1.4.3.tar.gz", "destFileName": "foreach_1.4.3.tar.gz" },
{ "name": "doParallel", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/doParallel_1.0.10.tar.gz", "destFileName": "doParallel_1.0.10.tar.gz" },
{ "name": "RUnit", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/RUnit_0.4.26.tar.gz", "destFileName": "RUnit_0.4.26.tar.gz" },
{ "name": "RevoMods", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/RevoMods_8.0.0.tar.gz", "destFileName": "RevoMods_8.0.0.tar.gz" },
{ "name": "RevoUtils", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/RevoUtils_8.0.0.tar.gz", "destFileName": "RevoUtils_8.0.0.tar.gz" },
Expand Down
6 changes: 3 additions & 3 deletions RRO-src/buildFiles/packages-windows-connector.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"packages": [
{ "name": "iterators", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/iterators_1.0.7.tar.gz", "destFileName": "iterators_1.0.7.tar.gz" },
{ "name": "foreach", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/foreach_1.4.2.tar.gz", "destFileName": "foreach_1.4.2.tar.gz" },
{ "name": "doParallel", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/doParallel_1.0.8.tar.gz", "destFileName": "doParallel_1.0.8.tar.gz" },
{ "name": "iterators", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/iterators_1.0.8.tar.gz", "destFileName": "iterators_1.0.8.tar.gz" },
{ "name": "foreach", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/foreach_1.4.3.tar.gz", "destFileName": "foreach_1.4.3.tar.gz" },
{ "name": "doParallel", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/doParallel_1.0.10.tar.gz", "destFileName": "doParallel_1.0.10.tar.gz" },
{ "name": "RUnit", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/RUnit_0.4.26.tar.gz", "destFileName": "RUnit_0.4.26.tar.gz" },
{ "name": "RevoMods", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/RevoMods_8.0.0.tar.gz", "destFileName": "RevoMods_8.0.0.tar.gz" },
{ "name": "RevoUtils", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/RevoUtils_8.0.0.tar.gz", "destFileName": "RevoUtils_8.0.0.tar.gz" },
Expand Down
3 changes: 2 additions & 1 deletion RRO-src/files/linux/spec/R_CENTOS.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ BuildRequires: libpng-devel, libjpeg-devel, readline-devel, libtiff-devel
BuildRequires: pango-devel, libXt-devel, libICE-devel, libX11-devel, libSM-devel
BuildRequires: cairo-devel, ncurses-devel
Requires: libpng, libjpeg, readline, libtiff, gcc, make, gcc-gfortran
Requires: ghostscript-fonts, libgfortran, cairo-devel, curl, libicu
Requires: ghostscript-fonts, libgfortran, cairo, curl, libicu
Requires: pango, libSM, libXt, libXmu, zip
AutoReqProv: No

Requires(post): info
Expand Down
2 changes: 1 addition & 1 deletion RRO-src/files/linux/spec/R_SLES10.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ BuildRequires: cairo-devel, ncurses-devel
Requires: libpng, libjpeg, readline
Requires: libtiff, ghostscript-fonts-std
Requires: gcc, make, gcc-fortran, gcc-c++
Requires: glibc, glibc-devel, curl
Requires: glibc, glibc-devel, curl, zip
AutoReqProv: No

%define libnn lib64
Expand Down
4 changes: 2 additions & 2 deletions RRO-src/files/linux/spec/R_SLES11.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ BuildRequires: libpng-devel, libjpeg-devel, readline-devel, libtiff-devel
BuildRequires: xorg-x11-libSM-devel, xorg-x11-libX11-devel, xorg-x11-libICE-devel,
BuildRequires: xorg-x11-libXt-devel, xorg-x11-libXmu-devel, pango-devel
BuildRequires: cairo-devel, ncurses-devel
Requires: libpng, libjpeg, readline, cairo-devel, libgfortran43
Requires: libpng, libjpeg, readline, cairo, libgfortran43
Requires: libtiff, ghostscript-fonts-std
Requires: gcc, make, gcc-fortran, gcc-c++, curl
Requires: gcc, make, gcc-fortran, gcc-c++, curl, zip
AutoReqProv: Yes

%define libnn lib64
Expand Down
42 changes: 21 additions & 21 deletions RRO-src/files/linux/spec/R_UBUNTU.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ and called at run time.

%build

./configure --prefix=%{_libdir}/RRO-%{DIR_VERSION}/R-%{version} --enable-R-shlib --with-tcltk --with-cairo --with-libpng --with-libtiff --with-x=yes --with-lapack --enable-BLAS-shlib LIBR="-lpthread" --enable-memory-profiling
./configure --prefix=%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version} --enable-R-shlib --with-tcltk --with-cairo --with-libpng --with-libtiff --with-x=yes --with-lapack --enable-BLAS-shlib LIBR="-lpthread" --enable-memory-profiling
make -j8

%install
Expand All @@ -43,16 +43,16 @@ make -j8
# %find_lang %{name}
rm -f %{buildroot}/%{_infodir}/dir

cp %{_topdir}/Rprofile.site %{buildroot}%{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/lib/R/etc
cp %{_topdir}/README.txt %{buildroot}%{_libdir}/RRO-%{DIR_VERSION}
cp %{_topdir}/COPYING %{buildroot}%{_libdir}/RRO-%{DIR_VERSION}
cp %{_topdir}/Rprofile.site %{buildroot}%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/lib/R/etc
cp %{_topdir}/README.txt %{buildroot}%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}
cp %{_topdir}/COPYING %{buildroot}%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}

if [ -d "/tmp/rro_extra_pkgs" ]
then
for filename in :::EXTRA_PKGS:::; do
%{buildroot}%{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/R --vanilla --install-tests CMD INSTALL /tmp/rro_extra_pkgs/${filename}
%{buildroot}%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/R --vanilla --install-tests CMD INSTALL /tmp/rro_extra_pkgs/${filename}
done
pushd %{buildroot}%{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/%libnn/R/library
pushd %{buildroot}%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%libnn/R/library
if [ -d "foreach" ]; then
rm -rf foreach
fi
Expand All @@ -69,37 +69,37 @@ if test "${RPM_INSTALL_PREFIX0}" = ""; then
fi
rm -f /usr/bin/R
rm -f /usr/bin/Rscript
ln -s $RPM_INSTALL_PREFIX0/%{_lib}/RRO-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/R $RPM_INSTALL_PREFIX0/%{_lib}/RRO-%{DIR_VERSION}/R-%{version}/bin/R
ln -s $RPM_INSTALL_PREFIX0/%{_lib}/RRO-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/Rscript $RPM_INSTALL_PREFIX0/%{_lib}/RRO-%{DIR_VERSION}/R-%{version}/bin/Rscript
ln -s $RPM_INSTALL_PREFIX0/%{_lib}/RRO-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/R /usr/bin
ln -s $RPM_INSTALL_PREFIX0/%{_lib}/RRO-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/Rscript /usr/bin
ln -s $RPM_INSTALL_PREFIX0/%{_lib}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/R $RPM_INSTALL_PREFIX0/%{_lib}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/bin/R
ln -s $RPM_INSTALL_PREFIX0/%{_lib}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/Rscript $RPM_INSTALL_PREFIX0/%{_lib}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/bin/Rscript
ln -s $RPM_INSTALL_PREFIX0/%{_lib}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/R /usr/bin
ln -s $RPM_INSTALL_PREFIX0/%{_lib}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/Rscript /usr/bin

%postun
#if test "${revo_prefix}" = ""; then
# revo_prefix=/usr
#fi
#revo_prefix=`echo "$revo_prefix" | sed "s/\/*$//"`
revo_prefix=/usr
rm -f ${revo_prefix}/lib64/RRO-%{DIR_VERSION}/R-%{version}/bin/R
rm -f ${revo_prefix}/lib64/RRO-%{DIR_VERSION}/R-%{version}/bin/Rscript
rm -f ${revo_prefix}/lib64/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/bin/R
rm -f ${revo_prefix}/lib64/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/bin/Rscript
rm -f /usr/bin/R
rm -f /usr/bin/Rscript

# %files -f %{name}.lang
%files
%defattr(-, root, root)
%{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/
%{_libdir}/RRO-%{DIR_VERSION}/COPYING
%{_libdir}/RRO-%{DIR_VERSION}/README.txt
# %{_libdir}/RRO-%{DIR_VERSION}/sources/
%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/
%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/COPYING
%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/README.txt
# %{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/sources/
#%{_bindir}/Revo64
#%{_bindir}/Revoscript

# %exclude %{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/%{libnn}/R/etc/repositories
# %exclude %{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/%{libnn}/R/lib/libRblas.so
# %exclude %{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/%{libnn}/R/lib/libRlapack.so
%exclude %{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/bin/R
%exclude %{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/bin/Rscript
# %exclude %{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%{libnn}/R/etc/repositories
# %exclude %{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%{libnn}/R/lib/libRblas.so
# %exclude %{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%{libnn}/R/lib/libRlapack.so
%exclude %{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/bin/R
%exclude %{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/bin/Rscript

%changelog
* Tue Sep 06 2011 The Coon of Ty <[email protected]> 2.8-1
Expand Down
2 changes: 1 addition & 1 deletion RRO-src/files/windows/connector/reg3264.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Icons]
Name: "{group}\RRO for RRE @RVER@ 64-bit"; Filename: "{app}\bin\x64\Rgui.exe"; IconFilename: "{app}\etc\REV_14419_Clark_2C.ico"; WorkingDir: "{userdocs}"; Check: isComponentSelected('x64') and Is64BitInstallMode
Name: "{group}\MRO for RRE @RVER@ 64-bit"; Filename: "{app}\bin\x64\Rgui.exe"; IconFilename: "{app}\etc\REV_14419_Clark_2C.ico"; WorkingDir: "{userdocs}"; Check: isComponentSelected('x64') and Is64BitInstallMode

Name: "{commondesktop}\MRO-for-RRE Rgui @RVER@ 64-bit"; Filename: "{app}\bin\x64\Rgui.exe"; MinVersion: 0,5.0; IconFilename: "{app}\etc\REV_14419_Clark_2C.ico"; Tasks: desktopicon; WorkingDir: "{userdocs}"; Check: isComponentSelected('x64') and Is64BitInstallMode

Expand Down