diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..936dd178 --- /dev/null +++ b/Jenkinsfile @@ -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]) + } +} diff --git a/RRO-src/buildFiles/packages-linux-connector.json b/RRO-src/buildFiles/packages-linux-connector.json index 3f1c1ed3..a02d16f6 100644 --- a/RRO-src/buildFiles/packages-linux-connector.json +++ b/RRO-src/buildFiles/packages-linux-connector.json @@ -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" }, diff --git a/RRO-src/buildFiles/packages-windows-connector.json b/RRO-src/buildFiles/packages-windows-connector.json index f6725a39..3651df0c 100644 --- a/RRO-src/buildFiles/packages-windows-connector.json +++ b/RRO-src/buildFiles/packages-windows-connector.json @@ -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" }, diff --git a/RRO-src/files/linux/spec/R_CENTOS.spec b/RRO-src/files/linux/spec/R_CENTOS.spec index 817ad6bb..5a72e756 100644 --- a/RRO-src/files/linux/spec/R_CENTOS.spec +++ b/RRO-src/files/linux/spec/R_CENTOS.spec @@ -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 diff --git a/RRO-src/files/linux/spec/R_SLES10.spec b/RRO-src/files/linux/spec/R_SLES10.spec index 32ce55f0..19686698 100644 --- a/RRO-src/files/linux/spec/R_SLES10.spec +++ b/RRO-src/files/linux/spec/R_SLES10.spec @@ -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 diff --git a/RRO-src/files/linux/spec/R_SLES11.spec b/RRO-src/files/linux/spec/R_SLES11.spec index a51e1c2b..550f4dc9 100644 --- a/RRO-src/files/linux/spec/R_SLES11.spec +++ b/RRO-src/files/linux/spec/R_SLES11.spec @@ -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 diff --git a/RRO-src/files/linux/spec/R_UBUNTU.spec b/RRO-src/files/linux/spec/R_UBUNTU.spec index 2597bd4f..eb232cc9 100644 --- a/RRO-src/files/linux/spec/R_UBUNTU.spec +++ b/RRO-src/files/linux/spec/R_UBUNTU.spec @@ -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 @@ -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 @@ -69,10 +69,10 @@ 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 @@ -80,26 +80,26 @@ ln -s $RPM_INSTALL_PREFIX0/%{_lib}/RRO-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/ #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 2.8-1 diff --git a/RRO-src/files/windows/connector/reg3264.iss b/RRO-src/files/windows/connector/reg3264.iss index 6d27a8e8..ba825cbc 100644 --- a/RRO-src/files/windows/connector/reg3264.iss +++ b/RRO-src/files/windows/connector/reg3264.iss @@ -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