Update of /cvsroot/fink/experimental/babayoshihiko/finkinfo In directory vz-cvs-3.sog:/tmp/cvs-serv13728
Modified Files: rstudio-desktop.info rstudio-server.info rstudio.patch Log Message: rstudio now ready Index: rstudio.patch =================================================================== RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/rstudio.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- rstudio.patch 22 Jul 2011 03:44:38 -0000 1.2 +++ rstudio.patch 28 Jul 2011 23:52:47 -0000 1.3 @@ -78,7 +78,7 @@ +# sudo cp /etc/pam.d/ftpd /etc/pam.d/rstudio diff -ruN rstudio-rstudio-a250b30/src/cpp/core/r_util/REnvironmentPosix.cpp rstudio-rstudio-a250b30-new/src/cpp/core/r_util/REnvironmentPosix.cpp --- rstudio-rstudio-a250b30/src/cpp/core/r_util/REnvironmentPosix.cpp 2011-06-12 00:09:57.000000000 +0900 -+++ rstudio-rstudio-a250b30-new/src/cpp/core/r_util/REnvironmentPosix.cpp 2011-07-14 08:42:40.000000000 +0900 ++++ rstudio-rstudio-a250b30-new/src/cpp/core/r_util/REnvironmentPosix.cpp 2011-07-20 11:30:55.000000000 +0900 @@ -78,6 +78,7 @@ { // define potential paths @@ -96,7 +96,15 @@ // lib path std::string rLibPath; -@@ -597,7 +598,7 @@ +@@ -210,6 +211,7 @@ + // scan in standard locations as a fallback + std::string scanErrMsg; + std::vector<std::string> rScriptPaths; ++ rScriptPaths.push_back("@PREFIX@/bin/R"); + rScriptPaths.push_back("/usr/local/bin/R"); + rScriptPaths.push_back("/usr/bin/R"); + FilePath scriptPath = scanForRScript(rScriptPaths, &scanErrMsg); +@@ -597,7 +599,7 @@ rLibPath = FilePath(); scriptVars.clear(); std::string scriptErrMsg; @@ -154,3 +162,16 @@ daemonCmd "restart" ;; +diff -ruN rstudio-rstudio-a250b30/src/cpp/server/extras/init.d/rstudio-server.xml rstudio-rstudio-a250b30-new/src/cpp/server/extras/init.d/rstudio-server.xml +--- rstudio-rstudio-a250b30/src/cpp/server/extras/init.d/rstudio-server.xml 1970-01-01 09:00:00.000000000 +0900 ++++ rstudio-rstudio-a250b30-new/src/cpp/server/extras/init.d/rstudio-server.xml 2011-07-28 20:20:13.000000000 +0900 +@@ -0,0 +1,9 @@ ++<service> ++<description>RStudio server</description> ++<message>RStudio server</message> ++ ++<daemon name="rstudio-server"> ++ <executable background="yes">@PREFIX@/share/rstudio-server/bin/rserver</executable> ++</daemon> ++ ++</service> Index: rstudio-desktop.info =================================================================== RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/rstudio-desktop.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- rstudio-desktop.info 22 Jul 2011 03:44:38 -0000 1.2 +++ rstudio-desktop.info 28 Jul 2011 23:52:47 -0000 1.3 @@ -1,6 +1,6 @@ Package: rstudio-desktop Version: 0.94.82 -Revision: 0.3 +Revision: 0.4 Description: IDE for R License: GPL Homepage: http://rstudio.org @@ -27,7 +27,7 @@ Source3: https://s3.amazonaws.com/rstudio-buildtools/gwt-2.3.0.zip Source3-MD5: 785cac54f4c359a98e8f5898d5a43dfa PatchFile: rstudio.patch -PatchFile-MD5: 3da57867199591b1d12b33926038e191 +PatchFile-MD5: 410cea75c0b96bc6497121aa2a0a17c9 PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 SetLDFLAGS: %p/Library/Frameworks/R.framework/Libraries/libR.dylib Index: rstudio-server.info =================================================================== RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/rstudio-server.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- rstudio-server.info 12 Jul 2011 23:56:43 -0000 1.1 +++ rstudio-server.info 28 Jul 2011 23:52:47 -0000 1.2 @@ -1,11 +1,17 @@ Package: rstudio-server Version: 0.94.82 -Revision: 0.3 +Revision: 0.4 Description: IDE for R License: GPL Homepage: http://rstudio.org Maintainer: BABA Yoshihiko <babayoshih...@mac.com> -Depends: r-base +DescUsage: << +Server: + Run `sudo daemonic enable rstudio-server' +Client: + Access http://localhost:8787/ +<< +Depends: r-base, daemonic, boost1.46.nopython-shlibs BuildDepends: fink (>= 0.28), cmake, boost1.46.nopython Source: http://homepage.mac.com/babayoshihiko/fink/rstudio-rstudio-v%v-0-ga250b30.tar.gz Source-MD5: 43754f89fe079700c5d3a181968133e3 @@ -18,7 +24,7 @@ Source3: https://s3.amazonaws.com/rstudio-buildtools/gwt-2.3.0.zip Source3-MD5: 785cac54f4c359a98e8f5898d5a43dfa PatchFile: rstudio.patch -PatchFile-MD5: bb192dbfbfa4aa88859ba9b9bda77cb3 +PatchFile-MD5: 410cea75c0b96bc6497121aa2a0a17c9 PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 SetLDFLAGS: %p/Library/Frameworks/R.framework/Libraries/libR.dylib @@ -38,7 +44,7 @@ cd build cmake -DRSTUDIO_TARGET=Server \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=%i \ + -DCMAKE_INSTALL_PREFIX=%i/share/%n \ -DCMAKE_INSTALL_LOCAL_ONLY=TRUE \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DLIBR_LIBRARIES=%p/Library/Frameworks/R.framework/Libraries \ @@ -49,10 +55,17 @@ # Install Phase. InstallScript: << #!/bin/bash -ev - cd build - make install CMAKE_INSTALL_PREFIX=%i + mkdir -p %i/bin + cp src/cpp/server/extras/admin/rstudio-server.in %i/bin/rstudio-server + chmod a+x %i/bin/rstudio-server + + pushd build + make install CMAKE_INSTALL_PREFIX=%i/share/%n + popd + + mkdir -p %i/etc/daemons/ + cp src/cpp/server/extras/init.d/rstudio-server.xml %i/etc/daemons/ << -DocFiles: COPYING NOTICE README.md INSTALL DescPackaging: << Requires Boost ------------------------------------------------------------------------------ Got Input? Slashdot Needs You. Take our quick survey online. Come on, we don't ask for help often. Plus, you'll get a chance to win $100 to spend on ThinkGeek. http://p.sf.net/sfu/slashdot-survey _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs