* master:
bump version and update readme
compile pwiz when installing on Windows
From: Laurent <lg390@cam.ac.uk>
git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/mzR@121436 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -2,7 +2,7 @@ Package: mzR |
2 | 2 |
Type: Package |
3 | 3 |
Title: parser for netCDF, mzXML, mzData and mzML and mzIdentML files |
4 | 4 |
(mass spectrometry data) |
5 |
-Version: 2.7.7 |
|
5 |
+Version: 2.7.8 |
|
6 | 6 |
Author: Bernd Fischer, Steffen Neumann, Laurent Gatto, Qiang Kou |
7 | 7 |
Maintainer: Bernd Fischer <b.fischer@dkfz.de>, |
8 | 8 |
Steffen Neumann <sneumann@ipb-halle.de>, |
... | ... |
@@ -1,7 +1,103 @@ |
1 |
+PWIZOBJECTS=\ |
|
2 |
+./boost/system/src/error_code.o \ |
|
3 |
+./boost/regex/src/posix_api.o \ |
|
4 |
+./boost/regex/src/fileiter.o \ |
|
5 |
+./boost/regex/src/regex_raw_buffer.o \ |
|
6 |
+./boost/regex/src/cregex.o \ |
|
7 |
+./boost/regex/src/regex_debug.o \ |
|
8 |
+./boost/regex/src/instances.o \ |
|
9 |
+./boost/regex/src/icu.o \ |
|
10 |
+./boost/regex/src/usinstances.o \ |
|
11 |
+./boost/regex/src/regex.o \ |
|
12 |
+./boost/regex/src/wide_posix_api.o \ |
|
13 |
+./boost/regex/src/regex_traits_defaults.o \ |
|
14 |
+./boost/regex/src/winstances.o \ |
|
15 |
+./boost/regex/src/wc_regex_traits.o \ |
|
16 |
+./boost/regex/src/c_regex_traits.o \ |
|
17 |
+./boost/regex/src/cpp_regex_traits.o \ |
|
18 |
+./boost/regex/src/static_mutex.o \ |
|
19 |
+./boost/regex/src/w32_regex_traits.o \ |
|
20 |
+./boost/iostreams/src/zlib.o \ |
|
21 |
+./boost/iostreams/src/file_descriptor.o \ |
|
22 |
+./boost/thread/pthread/once.o \ |
|
23 |
+./boost/thread/pthread/thread.o \ |
|
24 |
+./boost/filesystem/src/operations.o \ |
|
25 |
+./boost/filesystem/src/path.o \ |
|
26 |
+./boost/filesystem/src/utf8_codecvt_facet.o \ |
|
27 |
+./boost/chrono/src/chrono.o \ |
|
28 |
+./boost/chrono/src/process_cpu_clocks.o \ |
|
29 |
+./boost/chrono/src/thread_clock.o \ |
|
30 |
+./pwiz/data/msdata/Version.o \ |
|
31 |
+./pwiz/data/common/MemoryIndex.o \ |
|
32 |
+./pwiz/data/common/CVTranslator.o \ |
|
33 |
+./pwiz/data/common/cv.o \ |
|
34 |
+./pwiz/data/common/ParamTypes.o \ |
|
35 |
+./pwiz/data/common/BinaryIndexStream.o \ |
|
36 |
+./pwiz/data/common/diff_std.o \ |
|
37 |
+./pwiz/data/common/Unimod.o \ |
|
38 |
+./pwiz/data/msdata/SpectrumList_MGF.o \ |
|
39 |
+./pwiz/data/msdata/DefaultReaderList.o \ |
|
40 |
+./pwiz/data/msdata/ChromatogramList_mzML.o \ |
|
41 |
+./pwiz/data/msdata/examples.o \ |
|
42 |
+./pwiz/data/msdata/Serializer_mzML.o \ |
|
43 |
+./pwiz/data/msdata/Serializer_MSn.o \ |
|
44 |
+./pwiz/data/msdata/Reader.o \ |
|
45 |
+./pwiz/data/msdata/Serializer_MGF.o \ |
|
46 |
+./pwiz/data/msdata/Serializer_mzXML.o \ |
|
47 |
+./pwiz/data/msdata/SpectrumList_mzML.o \ |
|
48 |
+./pwiz/data/msdata/SpectrumList_MSn.o \ |
|
49 |
+./pwiz/data/msdata/BinaryDataEncoder.o \ |
|
50 |
+./pwiz/data/msdata/Diff.o \ |
|
51 |
+./pwiz/data/msdata/MSData.o \ |
|
52 |
+./pwiz/data/msdata/References.o \ |
|
53 |
+./pwiz/data/msdata/SpectrumList_mzXML.o \ |
|
54 |
+./pwiz/data/msdata/IO.o \ |
|
55 |
+./pwiz/data/msdata/SpectrumList_BTDX.o \ |
|
56 |
+./pwiz/data/msdata/SpectrumInfo.o \ |
|
57 |
+./pwiz/data/msdata/RAMPAdapter.o \ |
|
58 |
+./pwiz/data/msdata/LegacyAdapter.o \ |
|
59 |
+./pwiz/data/msdata/SpectrumIterator.o \ |
|
60 |
+./pwiz/data/msdata/MSDataFile.o \ |
|
61 |
+./pwiz/data/msdata/MSNumpress.o \ |
|
62 |
+./pwiz/data/msdata/SpectrumListCache.o \ |
|
63 |
+./pwiz/data/msdata/Index_mzML.o \ |
|
64 |
+./pwiz/data/msdata/SpectrumWorkerThreads.o \ |
|
65 |
+./pwiz/data/identdata/IdentDataFile.o \ |
|
66 |
+./pwiz/data/identdata/IdentData.o \ |
|
67 |
+./pwiz/data/identdata/DefaultReaderList.o \ |
|
68 |
+./pwiz/data/identdata/Reader.o \ |
|
69 |
+./pwiz/data/identdata/Serializer_protXML.o \ |
|
70 |
+./pwiz/data/identdata/Serializer_pepXML.o \ |
|
71 |
+./pwiz/data/identdata/Serializer_mzid.o \ |
|
72 |
+./pwiz/data/identdata/IO.o \ |
|
73 |
+./pwiz/data/identdata/References.o \ |
|
74 |
+./pwiz/data/identdata/MascotReader.o \ |
|
75 |
+./pwiz/data/proteome/Modification.o \ |
|
76 |
+./pwiz/data/proteome/Digestion.o \ |
|
77 |
+./pwiz/data/proteome/Peptide.o \ |
|
78 |
+./pwiz/data/proteome/AminoAcid.o \ |
|
79 |
+./pwiz/utility/minimxml/XMLWriter.o \ |
|
80 |
+./pwiz/utility/minimxml/SAXParser.o \ |
|
81 |
+./pwiz/utility/chemistry/Chemistry.o \ |
|
82 |
+./pwiz/utility/chemistry/ChemistryData.o \ |
|
83 |
+./pwiz/utility/chemistry/MZTolerance.o \ |
|
84 |
+./pwiz/utility/misc/IntegerSet.o \ |
|
85 |
+./pwiz/utility/misc/Base64.o \ |
|
86 |
+./pwiz/utility/misc/IterationListener.o \ |
|
87 |
+./pwiz/utility/misc/MSIHandler.o \ |
|
88 |
+./pwiz/utility/misc/Filesystem.o \ |
|
89 |
+./pwiz/utility/misc/TabReader.o \ |
|
90 |
+./pwiz/utility/misc/random_access_compressed_ifstream.o \ |
|
91 |
+./pwiz/utility/misc/SHA1.o \ |
|
92 |
+./pwiz/utility/misc/SHA1Calculator.o \ |
|
93 |
+./pwiz/utility/misc/sha1calc.o \ |
|
94 |
+./random_access_gzFile.o \ |
|
95 |
+./RcppExports.o |
|
96 |
+ |
|
1 | 97 |
|
2 | 98 |
MZROBJECTS=cramp.o ramp_base64.o ramp.o RcppRamp.o RcppRampModule.o rnetCDF.o RcppPwiz.o RcppPwizModule.o RcppIdent.o RcppIdentModule.o RcppExports.o |
3 | 99 |
|
4 |
-OBJECTS= $(MZROBJECTS) R_init_mzR.o rampR.o |
|
100 |
+OBJECTS= $(MZROBJECTS) $(PWIZOBJECTS) rampR.o R_init_mzR.o |
|
5 | 101 |
|
6 | 102 |
PWIZ_CPPFLAGS=-I./boost_aux/ -I./boost -I. -DHAVE_PWIZ_MZML_LIB -DWITHOUT_MZ5 -fpermissive -DWINDOWS_NATIVE |
7 | 103 |
|
... | ... |
@@ -20,7 +116,7 @@ else |
20 | 116 |
LD_ULDAR="-Wl,--dynamic-linker=$(ULDAR)/ld.exe" |
21 | 117 |
endif |
22 | 118 |
|
23 |
-PKG_LIBS = $(LD_ULDAR) $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" ) $(PWIZ_LDFLAGS) -L./win/$(R_ARCH) -lws2_32 -lnetcdf -lpwiz |
|
119 |
+PKG_LIBS = $(LD_ULDAR) $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" ) $(PWIZ_LDFLAGS) -L./win/$(R_ARCH) -lws2_32 -lnetcdf |
|
24 | 120 |
|
25 | 121 |
all: clean $(SHLIB) |
26 | 122 |
|