git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@63434 bc3139a8-67e5-0310-9ffc-ced21a209358
1 | 1 |
deleted file mode 100755 |
... | ... |
@@ -1,23 +0,0 @@ |
1 |
-echo "Building libRcpp.a in RcppSrc..." |
|
2 |
-CXX=`${R_HOME}/bin/R CMD config CXX` |
|
3 |
-CC=`${R_HOME}/bin/R CMD config CC` |
|
4 |
-echo "... using <${CC}> and <${CXX}>" |
|
5 |
-cd RcppSrc |
|
6 |
-make CXX="${CXX}" RHOME=${R_HOME} -f Makefile.win |
|
7 |
-cd .. |
|
8 |
-if test \! -d inst |
|
9 |
-then |
|
10 |
- mkdir inst |
|
11 |
-fi |
|
12 |
-cp RcppSrc/Rcpp-license.txt inst |
|
13 |
- |
|
14 |
-echo "Building imslib.dll in src/imslib... with <${CC}> and <${CXX}>" |
|
15 |
-cd src/imslib/ |
|
16 |
-./configure --enable-shared --disable-static |
|
17 |
-make src/libims.la |
|
18 |
-IMS_CFLAGS=-I./imslib/src/ |
|
19 |
- |
|
20 |
-cd ../.. |
|
21 |
- |
|
22 |
- |
|
23 |
- |
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@63278 bc3139a8-67e5-0310-9ffc-ced21a209358
1 | 1 |
new file mode 100755 |
... | ... |
@@ -0,0 +1,23 @@ |
1 |
+echo "Building libRcpp.a in RcppSrc..." |
|
2 |
+CXX=`${R_HOME}/bin/R CMD config CXX` |
|
3 |
+CC=`${R_HOME}/bin/R CMD config CC` |
|
4 |
+echo "... using <${CC}> and <${CXX}>" |
|
5 |
+cd RcppSrc |
|
6 |
+make CXX="${CXX}" RHOME=${R_HOME} -f Makefile.win |
|
7 |
+cd .. |
|
8 |
+if test \! -d inst |
|
9 |
+then |
|
10 |
+ mkdir inst |
|
11 |
+fi |
|
12 |
+cp RcppSrc/Rcpp-license.txt inst |
|
13 |
+ |
|
14 |
+echo "Building imslib.dll in src/imslib... with <${CC}> and <${CXX}>" |
|
15 |
+cd src/imslib/ |
|
16 |
+./configure --enable-shared --disable-static |
|
17 |
+make src/libims.la |
|
18 |
+IMS_CFLAGS=-I./imslib/src/ |
|
19 |
+ |
|
20 |
+cd ../.. |
|
21 |
+ |
|
22 |
+ |
|
23 |
+ |
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@63261 bc3139a8-67e5-0310-9ffc-ced21a209358
1 | 1 |
deleted file mode 100755 |
... | ... |
@@ -1,23 +0,0 @@ |
1 |
-echo "Building libRcpp.a in RcppSrc..." |
|
2 |
-CXX=`${R_HOME}/bin/R CMD config CXX` |
|
3 |
-CC=`${R_HOME}/bin/R CMD config CC` |
|
4 |
-echo "... using <${CC}> and <${CXX}>" |
|
5 |
-cd RcppSrc |
|
6 |
-make CXX="${CXX}" RHOME=${R_HOME} -f Makefile.win |
|
7 |
-cd .. |
|
8 |
-if test \! -d inst |
|
9 |
-then |
|
10 |
- mkdir inst |
|
11 |
-fi |
|
12 |
-cp RcppSrc/Rcpp-license.txt inst |
|
13 |
- |
|
14 |
-echo "Building imslib.dll in src/imslib... with <${CC}> and <${CXX}>" |
|
15 |
-cd src/imslib/ |
|
16 |
-./configure --enable-shared --disable-static |
|
17 |
-make src/libims.la |
|
18 |
-IMS_CFLAGS=-I./imslib/src/ |
|
19 |
- |
|
20 |
-cd ../.. |
|
21 |
- |
|
22 |
- |
|
23 |
- |
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@62244 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -3,7 +3,7 @@ CXX=`${R_HOME}/bin/R CMD config CXX` |
3 | 3 |
CC=`${R_HOME}/bin/R CMD config CC` |
4 | 4 |
echo "... using <${CC}> and <${CXX}>" |
5 | 5 |
cd RcppSrc |
6 |
-make CXX=${CXX} RHOME=${R_HOME} -f Makefile.win |
|
6 |
+make CXX="${CXX}" RHOME=${R_HOME} -f Makefile.win |
|
7 | 7 |
cd .. |
8 | 8 |
if test \! -d inst |
9 | 9 |
then |
... | ... |
@@ -13,7 +13,7 @@ cp RcppSrc/Rcpp-license.txt inst |
13 | 13 |
|
14 | 14 |
echo "Building imslib.dll in src/imslib... with <${CC}> and <${CXX}>" |
15 | 15 |
cd src/imslib/ |
16 |
-configure --enable-shared --disable-static |
|
16 |
+./configure --enable-shared --disable-static |
|
17 | 17 |
make src/libims.la |
18 | 18 |
IMS_CFLAGS=-I./imslib/src/ |
19 | 19 |
|
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@49338 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -12,19 +12,12 @@ fi |
12 | 12 |
cp RcppSrc/Rcpp-license.txt inst |
13 | 13 |
|
14 | 14 |
echo "Building imslib.dll in src/imslib... with <${CC}> and <${CXX}>" |
15 |
-#cd src/imslib/ |
|
16 |
-#configure |
|
17 |
-#make src/libims.la |
|
15 |
+cd src/imslib/ |
|
16 |
+configure --enable-shared --disable-static |
|
17 |
+make src/libims.la |
|
18 |
+IMS_CFLAGS=-I./imslib/src/ |
|
18 | 19 |
|
19 |
-mkdir -p ${R_PACKAGE_DIR}/libs${R_ARCH} |
|
20 |
-echo "cp src/win/${R_ARCH}/libims*.dll R_PACKAGE_DIR:${R_PACKAGE_DIR}/libs${R_ARCH}" |
|
21 |
-cp src/win/${R_ARCH}/libims*.dll ${R_PACKAGE_DIR}/libs${R_ARCH} |
|
22 |
-ls -l src/win/${R_ARCH}/libims*.dll |
|
23 |
- |
|
24 |
-echo "libs in instal directory..." |
|
25 |
-ls -l ${R_PACKAGE_DIR}/libs${R_ARCH} |
|
26 |
- |
|
27 |
-#cd ../.. |
|
20 |
+cd ../.. |
|
28 | 21 |
|
29 | 22 |
|
30 | 23 |
|
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@49235 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -19,7 +19,7 @@ echo "Building imslib.dll in src/imslib... with <${CC}> and <${CXX}>" |
19 | 19 |
mkdir -p ${R_PACKAGE_DIR}/libs${R_ARCH} |
20 | 20 |
echo "cp src/win/${R_ARCH}/libims*.dll R_PACKAGE_DIR:${R_PACKAGE_DIR}/libs${R_ARCH}" |
21 | 21 |
cp src/win/${R_ARCH}/libims*.dll ${R_PACKAGE_DIR}/libs${R_ARCH} |
22 |
-ls -l src/win/${R_ARCH}/${R_ARCH}/libims*.dll |
|
22 |
+ls -l src/win/${R_ARCH}/libims*.dll |
|
23 | 23 |
|
24 | 24 |
echo "libs in instal directory..." |
25 | 25 |
ls -l ${R_PACKAGE_DIR}/libs${R_ARCH} |
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@49196 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -17,9 +17,9 @@ echo "Building imslib.dll in src/imslib... with <${CC}> and <${CXX}>" |
17 | 17 |
#make src/libims.la |
18 | 18 |
|
19 | 19 |
mkdir -p ${R_PACKAGE_DIR}/libs${R_ARCH} |
20 |
-echo "cp src/winlibs/libims*.dll R_PACKAGE_DIR:${R_PACKAGE_DIR}/libs${R_ARCH}" |
|
21 |
-cp src/winlibs/libims*.dll ${R_PACKAGE_DIR}/libs${R_ARCH} |
|
22 |
-ls -l src/winlibs/${R_ARCH}/libims*.dll |
|
20 |
+echo "cp src/win/${R_ARCH}/libims*.dll R_PACKAGE_DIR:${R_PACKAGE_DIR}/libs${R_ARCH}" |
|
21 |
+cp src/win/${R_ARCH}/libims*.dll ${R_PACKAGE_DIR}/libs${R_ARCH} |
|
22 |
+ls -l src/win/${R_ARCH}/${R_ARCH}/libims*.dll |
|
23 | 23 |
|
24 | 24 |
echo "libs in instal directory..." |
25 | 25 |
ls -l ${R_PACKAGE_DIR}/libs${R_ARCH} |
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@49121 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -16,10 +16,10 @@ echo "Building imslib.dll in src/imslib... with <${CC}> and <${CXX}>" |
16 | 16 |
#configure |
17 | 17 |
#make src/libims.la |
18 | 18 |
|
19 |
-mkdir ${R_PACKAGE_DIR}/libs |
|
20 |
-echo "cp src/winlibs/libims*.dll R_PACKAGE_DIR:${R_PACKAGE_DIR}/libs/" |
|
19 |
+mkdir -p ${R_PACKAGE_DIR}/libs${R_ARCH} |
|
20 |
+echo "cp src/winlibs/libims*.dll R_PACKAGE_DIR:${R_PACKAGE_DIR}/libs${R_ARCH}" |
|
21 | 21 |
cp src/winlibs/libims*.dll ${R_PACKAGE_DIR}/libs${R_ARCH} |
22 |
-ls -l src/winlibs/libims*.dll |
|
22 |
+ls -l src/winlibs/${R_ARCH}/libims*.dll |
|
23 | 23 |
|
24 | 24 |
echo "libs in instal directory..." |
25 | 25 |
ls -l ${R_PACKAGE_DIR}/libs${R_ARCH} |
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@49083 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -18,11 +18,11 @@ echo "Building imslib.dll in src/imslib... with <${CC}> and <${CXX}>" |
18 | 18 |
|
19 | 19 |
mkdir ${R_PACKAGE_DIR}/libs |
20 | 20 |
echo "cp src/winlibs/libims*.dll R_PACKAGE_DIR:${R_PACKAGE_DIR}/libs/" |
21 |
-cp src/winlibs/libims*.dll ${R_PACKAGE_DIR}/libs/ |
|
21 |
+cp src/winlibs/libims*.dll ${R_PACKAGE_DIR}/libs${R_ARCH} |
|
22 | 22 |
ls -l src/winlibs/libims*.dll |
23 | 23 |
|
24 | 24 |
echo "libs in instal directory..." |
25 |
-ls -l ${R_PACKAGE_DIR}/libs/ |
|
25 |
+ls -l ${R_PACKAGE_DIR}/libs${R_ARCH} |
|
26 | 26 |
|
27 | 27 |
#cd ../.. |
28 | 28 |
|
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@48996 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -1,7 +1,7 @@ |
1 | 1 |
echo "Building libRcpp.a in RcppSrc..." |
2 |
-R_HOME=`R RHOME` |
|
3 |
-CXX=`R CMD config CXX` |
|
4 |
-CC=`R CMD config CC` |
|
2 |
+CXX=`${R_HOME}/bin/R CMD config CXX` |
|
3 |
+CC=`${R_HOME}/bin/R CMD config CC` |
|
4 |
+echo "... using <${CC}> and <${CXX}>" |
|
5 | 5 |
cd RcppSrc |
6 | 6 |
make CXX=${CXX} RHOME=${R_HOME} -f Makefile.win |
7 | 7 |
cd .. |
... | ... |
@@ -11,7 +11,7 @@ then |
11 | 11 |
fi |
12 | 12 |
cp RcppSrc/Rcpp-license.txt inst |
13 | 13 |
|
14 |
-echo "Building imslib.dll in src/imslib..." |
|
14 |
+echo "Building imslib.dll in src/imslib... with <${CC}> and <${CXX}>" |
|
15 | 15 |
#cd src/imslib/ |
16 | 16 |
#configure |
17 | 17 |
#make src/libims.la |
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@38498 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -16,12 +16,13 @@ echo "Building imslib.dll in src/imslib..." |
16 | 16 |
#configure |
17 | 17 |
#make src/libims.la |
18 | 18 |
|
19 |
-mkdir ${DPKG}/libs |
|
20 |
-cp src/winlibs/libims*.dll ${DPKG}/libs/ |
|
19 |
+mkdir ${R_PACKAGE_DIR}/libs |
|
20 |
+echo "cp src/winlibs/libims*.dll R_PACKAGE_DIR:${R_PACKAGE_DIR}/libs/" |
|
21 |
+cp src/winlibs/libims*.dll ${R_PACKAGE_DIR}/libs/ |
|
21 | 22 |
ls -l src/winlibs/libims*.dll |
22 | 23 |
|
23 | 24 |
echo "libs in instal directory..." |
24 |
-ls -l ${DPKG}/libs/ |
|
25 |
+ls -l ${R_PACKAGE_DIR}/libs/ |
|
25 | 26 |
|
26 | 27 |
#cd ../.. |
27 | 28 |
|
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@38409 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -18,8 +18,9 @@ echo "Building imslib.dll in src/imslib..." |
18 | 18 |
|
19 | 19 |
mkdir ${DPKG}/libs |
20 | 20 |
cp src/winlibs/libims*.dll ${DPKG}/libs/ |
21 |
+ls -l src/winlibs/libims*.dll |
|
21 | 22 |
|
22 |
-ls -l src/win/libims*.dll |
|
23 |
+echo "libs in instal directory..." |
|
23 | 24 |
ls -l ${DPKG}/libs/ |
24 | 25 |
|
25 | 26 |
#cd ../.. |
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@33668 bc3139a8-67e5-0310-9ffc-ced21a209358
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@29075 bc3139a8-67e5-0310-9ffc-ced21a209358
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@29074 bc3139a8-67e5-0310-9ffc-ced21a209358
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@29015 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -12,17 +12,17 @@ fi |
12 | 12 |
cp RcppSrc/Rcpp-license.txt inst |
13 | 13 |
|
14 | 14 |
echo "Building imslib.dll in src/imslib..." |
15 |
-cd src/imslib/ |
|
16 |
-configure |
|
17 |
-make src/libims.la |
|
15 |
+#cd src/imslib/ |
|
16 |
+#configure |
|
17 |
+#make src/libims.la |
|
18 | 18 |
|
19 |
-mkdir -f $DPKG/libs |
|
20 |
-cp src/.libs/libims* $DPKG/libs/ |
|
19 |
+mkdir ${DPKG}/libs |
|
20 |
+cp src/win/libims-0.dll ${DPKG}/libs/ |
|
21 | 21 |
|
22 |
-ls -l src/.libs/ |
|
23 |
-ls -l $DPKG/libs/ |
|
22 |
+ls -l src/win/libims*.dll |
|
23 |
+ls -l ${DPKG}/libs/ |
|
24 | 24 |
|
25 |
-cd ../.. |
|
25 |
+#cd ../.. |
|
26 | 26 |
|
27 | 27 |
|
28 | 28 |
|
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@28446 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -1,5 +1,7 @@ |
1 | 1 |
echo "Building libRcpp.a in RcppSrc..." |
2 | 2 |
R_HOME=`R RHOME` |
3 |
+CXX=`R CMD config CXX` |
|
4 |
+CC=`R CMD config CC` |
|
3 | 5 |
cd RcppSrc |
4 | 6 |
make RHOME=${R_HOME} -f Makefile.win |
5 | 7 |
cd .. |
... | ... |
@@ -9,7 +11,7 @@ then |
9 | 11 |
fi |
10 | 12 |
cp RcppSrc/Rcpp-license.txt inst |
11 | 13 |
|
12 |
-echo "Building imslib.daa in src/imslib..." |
|
14 |
+echo "Building imslib.dll in src/imslib..." |
|
13 | 15 |
cd src/imslib/ |
14 | 16 |
configure |
15 | 17 |
make src/libims.la |
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@28130 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -13,8 +13,13 @@ echo "Building imslib.daa in src/imslib..." |
13 | 13 |
cd src/imslib/ |
14 | 14 |
configure |
15 | 15 |
make src/libims.la |
16 |
-mkdir $DPKG/libs |
|
17 |
-cp src/.libs/libims-0.dll $DPKG/libs/ |
|
16 |
+ |
|
17 |
+mkdir -f $DPKG/libs |
|
18 |
+cp src/.libs/libims* $DPKG/libs/ |
|
19 |
+ |
|
20 |
+ls -l src/.libs/ |
|
21 |
+ls -l $DPKG/libs/ |
|
22 |
+ |
|
18 | 23 |
cd ../.. |
19 | 24 |
|
20 | 25 |
|
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@28010 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -1,12 +1,21 @@ |
1 |
-echo "Building libRcpp.a in RcppSrc..." |
|
2 |
-R_HOME=`R RHOME` |
|
3 |
-CXX=`R CMD config CXX` |
|
4 |
-cd RcppSrc |
|
5 |
-make RHOME=${R_HOME} CXX=${CXX} -f Makefile.win |
|
6 |
-cd .. |
|
7 |
-if test \! -d inst |
|
8 |
-then |
|
9 |
- mkdir inst |
|
10 |
-fi |
|
11 |
-cp RcppSrc/Rcpp-license.txt inst |
|
12 |
- |
|
1 |
+echo "Building libRcpp.a in RcppSrc..." |
|
2 |
+R_HOME=`R RHOME` |
|
3 |
+cd RcppSrc |
|
4 |
+make RHOME=${R_HOME} -f Makefile.win |
|
5 |
+cd .. |
|
6 |
+if test \! -d inst |
|
7 |
+then |
|
8 |
+ mkdir inst |
|
9 |
+fi |
|
10 |
+cp RcppSrc/Rcpp-license.txt inst |
|
11 |
+ |
|
12 |
+echo "Building imslib.daa in src/imslib..." |
|
13 |
+cd src/imslib/ |
|
14 |
+configure |
|
15 |
+make src/libims.la |
|
16 |
+mkdir $DPKG/libs |
|
17 |
+cp src/.libs/libims-0.dll $DPKG/libs/ |
|
18 |
+cd ../.. |
|
19 |
+ |
|
20 |
+ |
|
21 |
+ |
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@27994 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -1,7 +1,8 @@ |
1 | 1 |
echo "Building libRcpp.a in RcppSrc..." |
2 | 2 |
R_HOME=`R RHOME` |
3 |
+CXX=`R CMD config CXX` |
|
3 | 4 |
cd RcppSrc |
4 |
-make RHOME=$R_HOME -f Makefile.win |
|
5 |
+make RHOME=${R_HOME} CXX=${CXX} -f Makefile.win |
|
5 | 6 |
cd .. |
6 | 7 |
if test \! -d inst |
7 | 8 |
then |
... | ... |
@@ -9,17 +10,3 @@ then |
9 | 10 |
fi |
10 | 11 |
cp RcppSrc/Rcpp-license.txt inst |
11 | 12 |
|
12 |
-#echo "Building libims.a in imslib..." |
|
13 |
-#cd imslib |
|
14 |
-#./autogen.sh |
|
15 |
-#sh ./configure |
|
16 |
-#make ./src/libims.la |
|
17 |
-#cp ./src/libims-0.dll src/win/ |
|
18 |
-#cd .. |
|
19 |
- |
|
20 |
-IMS_CFLAGS=-I../imslib/src/ |
|
21 |
-IMS_LIBS=../imslib/src/.libs/libims.a |
|
22 |
- |
|
23 |
-CPPFLAGS="$CPPFLAGS -I../RcppSrc $IMS_CFLAGS" |
|
24 |
-LDFLAGS="${LDFLAGS} -L../RcppSrc -lRcpp $IMS_LIBS" |
|
25 |
-LIBS="${LIBS} -lRcpp $IMS_LIBS" |
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@27972 bc3139a8-67e5-0310-9ffc-ced21a209358
1 | 1 |
new file mode 100755 |
... | ... |
@@ -0,0 +1,25 @@ |
1 |
+echo "Building libRcpp.a in RcppSrc..." |
|
2 |
+R_HOME=`R RHOME` |
|
3 |
+cd RcppSrc |
|
4 |
+make RHOME=$R_HOME -f Makefile.win |
|
5 |
+cd .. |
|
6 |
+if test \! -d inst |
|
7 |
+then |
|
8 |
+ mkdir inst |
|
9 |
+fi |
|
10 |
+cp RcppSrc/Rcpp-license.txt inst |
|
11 |
+ |
|
12 |
+#echo "Building libims.a in imslib..." |
|
13 |
+#cd imslib |
|
14 |
+#./autogen.sh |
|
15 |
+#sh ./configure |
|
16 |
+#make ./src/libims.la |
|
17 |
+#cp ./src/libims-0.dll src/win/ |
|
18 |
+#cd .. |
|
19 |
+ |
|
20 |
+IMS_CFLAGS=-I../imslib/src/ |
|
21 |
+IMS_LIBS=../imslib/src/.libs/libims.a |
|
22 |
+ |
|
23 |
+CPPFLAGS="$CPPFLAGS -I../RcppSrc $IMS_CFLAGS" |
|
24 |
+LDFLAGS="${LDFLAGS} -L../RcppSrc -lRcpp $IMS_LIBS" |
|
25 |
+LIBS="${LIBS} -lRcpp $IMS_LIBS" |