Permalink
Browse files

changes needed for the new RAqua and Rframework

git-svn-id: https://svn.r-project.org/R/trunk@27432 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent a83f1b7 commit 60ee3fae56945b46b05c0f7d65e266a7f89261f6 iacus committed Dec 8, 2003
Showing with 28 additions and 11 deletions.
  1. +28 −11 Makefile.in
View
@@ -160,18 +160,12 @@ check check-devel check-all:
reset-recommended:
@(cd src/library/Recommended && $(MAKE) clean)
-aqualaunch:
- @(cd $(top_builddir)/src/modules/aqua && \
- $(MAKE) aqualaunch)
-install-aqua: aqualaunch
- @(rm -rf /Applications/StartR.app);
- @(cd $(top_builddir) && \
- $(MAKE) install \
- rhome=/Applications/StartR.app/RAqua.app/Contents \
- mandir=/Applications/StartR.app/RAqua.app/Contents \
- bindir=/Applications/StartR.app/RAqua.app/Contents )
- @(cd src/modules/aqua && sh AquaInstall)
+
install-Rframework:
+ @if test -z ${Rframework_path} ; then \
+ echo "please define the variable Rframework_path first"; \
+ exit 1 ;\
+ fi
@(cd $(top_builddir) && \
$(MAKE) install \
rhome="${Rframework_path}/R.framework/Versions/$(VERSION)/Resources" \
@@ -188,4 +182,27 @@ install-Rframework:
ln -f -s Versions/Current/Headers Headers&& \
ln -f -s Versions/Current/R R && \
ln -f -s Versions/Current/Resources Resources)
+ @(cd "$(srcdir)/src/modules/aqua/Contents/Resources" && \
+ cp -R * "${Rframework_path}/R.framework/Resources/bin")
+ @(cd "${Rframework_path}/R.framework/Resources/bin" && \
+ sed 's/^args=/args=--gui=aqua/' < R > RAqua && \
+ chmod 755 RAqua)
+
+install-aqua:
+ @if test -z ${Rframework_path} ; then \
+ echo "please define the variable Rframework_path first"; \
+ exit 1 ;\
+ fi
+ @(rm -rf /Applications/R.app)
+ @(mkdir -p /Applications/R.app/Contents/Resources)
+ @(cd "$(srcdir)/src/modules/aqua/Contents" && \
+ cp Info.plist PkgInfo /Applications/R.app/Contents)
+ @(cd "$(srcdir)/src/modules/aqua/Contents/Resources" && \
+ cp -R * /Applications/R.app/Contents/Resources)
+ @(mkdir -p /Applications/R.app/Contents/MacOS)
+ @test -f "${Rframework_path}/R.framework/Resources/bin/RAqua" \
+ || (echo "please, make install-Rframework first" && exit 1)
+ @(cd /Applications/R.app/Contents/MacOS && \
+ ln -f "${Rframework_path}/R.framework/Resources/bin/RAqua" R && \
+ chmod 755 R)
TAGS:

0 comments on commit 60ee3fa

Please sign in to comment.