git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@63551 bc3139a8-67e5-0310-9ffc-ced21a209358
s.neumann authored on 06/03/2012 20:31:22
| ... | ... |
@@ -1,3 +1,6 @@ |
| 1 |
+2012-03-06 Steffen Neumann <sneumann@ipb-halle.de> |
|
| 2 |
+ * Windows build fixes, removed old configure.in |
|
| 3 |
+ |
|
| 1 | 4 |
2012-02-23 Steffen Neumann <sneumann@ipb-halle.de> |
| 2 | 5 |
* Moved from the ancient embedded Rcpp to RcppClassic, |
| 3 | 6 |
thanks to the work of Dirk Eddelbuettel who did the porting |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Package: Rdisop |
| 2 | 2 |
Title: Decomposition of Isotopic Patterns |
| 3 |
-Version: 1.15.5 |
|
| 4 |
-Date: 2012-02-29 |
|
| 3 |
+Version: 1.15.6 |
|
| 4 |
+Date: 2012-03-06 |
|
| 5 | 5 |
Author: Anton Pervukhin <apervukh@minet.uni-jena.de>, Steffen Neumann <sneumann@ipb-halle.de> |
| 6 | 6 |
Maintainer: Steffen Neumann <sneumann@ipb-halle.de> |
| 7 | 7 |
Description: Identification of metabolites using high precision mass |
| 8 | 8 |
deleted file mode 100644 |
| ... | ... |
@@ -1,43 +0,0 @@ |
| 1 |
-dnl package name, version |
|
| 2 |
-AC_INIT([Rdisop], 0.4) |
|
| 3 |
- |
|
| 4 |
-dnl require version 2.5+ of autoconf |
|
| 5 |
-AC_PREREQ(2.50) |
|
| 6 |
- |
|
| 7 |
-dnl the CC and CFLAGS variables control configure tests, and they need to |
|
| 8 |
-dnl be the same as what will be used when the package is built. There is |
|
| 9 |
-dnl no need to place these flags in Makevars, and if no configure tests are |
|
| 10 |
-dnl done they are not needed here (see "Writing R Extensions" manual). |
|
| 11 |
-: ${R_HOME=`R RHOME`}
|
|
| 12 |
-if test -z "${R_HOME}"; then
|
|
| 13 |
- echo "Could not determine R home directory" |
|
| 14 |
- exit 1 |
|
| 15 |
-fi |
|
| 16 |
-CXX=`"${R_HOME}/bin/R" CMD config CXX`
|
|
| 17 |
-CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS`
|
|
| 18 |
- |
|
| 19 |
-AC_LANG(C++) dnl using C++ |
|
| 20 |
- |
|
| 21 |
-AC_REQUIRE_CPP |
|
| 22 |
- |
|
| 23 |
-dnl configure IMS include/load flags and copy sample source to inst/doc |
|
| 24 |
-dnl if IMS not found via PKG, use included static Version |
|
| 25 |
- |
|
| 26 |
-#echo "Configuring libims.a in imslib..." |
|
| 27 |
-#cd src/imslib |
|
| 28 |
-#./configure --enable-shared --disable-static |
|
| 29 |
-#./configure --enable-static --disable-shared |
|
| 30 |
-#make src/libims.la |
|
| 31 |
-#cd ../../ |
|
| 32 |
-IMS_CFLAGS=-I./imslib/src/ |
|
| 33 |
- |
|
| 34 |
-RCPPCLASSIC_LDFLAGS=`${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"`
|
|
| 35 |
-RCPPCLASSIC_LDFLAGS+=" " |
|
| 36 |
-RCPPCLASSIC_LDFLAGS=`${R_HOME}/bin/Rscript -e "RcppClassic:::LdFlags()"`
|
|
| 37 |
- |
|
| 38 |
-AC_SUBST([CPPFLAGS], ["${CPPFLAGS} $IMS_CFLAGS"])
|
|
| 39 |
-AC_SUBST([LDFLAGS], ["${LDFLAGS} ${RCPPCLASSIC_LDFLAGS}"])
|
|
| 40 |
- |
|
| 41 |
-AC_SUBST(WANT_MSI_TRUE) |
|
| 42 |
-AC_SUBST(CPPFLAGS) |
|
| 43 |
-AC_SUBST(LDFLAGS) |
| ... | ... |
@@ -3,6 +3,8 @@ |
| 3 | 3 |
|
| 4 | 4 |
PKG_CXXFLAGS+= -I./imslib/src/ |
| 5 | 5 |
|
| 6 |
+#PKG_LIBS=`${R_HOME}/bin/Rscript -e "Rcpp:::LdFlags()"` `${R_HOME}/bin/Rscript -e "RcppClassic:::LdFlags()"`
|
|
| 7 |
+ |
|
| 6 | 8 |
PKG_LIBS += $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "RcppClassic:::LdFlags()")
|
| 7 | 9 |
PKG_LIBS += $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
|
| 8 | 10 |
|