Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
0b118a9
imzML support
kpnovoselov Apr 9, 2023
36d63d8
cmake tools update
kpnovoselov Apr 10, 2023
d158017
test github commit
kpnovoselov Nov 7, 2023
a80a7eb
changes pixels size x description
novoselov-mt Jan 15, 2024
37a84b4
Updated to new VS
novoselov-mt Jan 15, 2024
e845574
quick fix for reddistr. Run script twice
novoselov-mt Jun 19, 2024
c0a02b1
msconvert-help.txt
novoselov-mt Jul 27, 2024
0103916
merged with pwiz head
novoselov-mt Jul 27, 2024
a60ad72
Minor changes to build scripts
novoselov-mt Aug 4, 2024
9e266ca
Merge pull request #1 from kpnovoselov/imzml
kpnovoselov Aug 4, 2024
7a9b9f7
copy script has been added. j8 option has been removed
novoselov-mt Aug 4, 2024
ff626d7
ChromatogramList_LockmassRefinerTest and SpectrumList_PrecursorRecalc…
kpnovoselov May 22, 2025
79568d0
more test were disabled
kpnovoselov May 22, 2025
4e2f885
push test
novoselov-mt Oct 10, 2025
cd832d6
more tests disabled
kpnovoselov Oct 10, 2025
26bdb71
minor fix to jam
kpnovoselov Oct 10, 2025
0d6c4ca
bindings were disabled
kpnovoselov Oct 13, 2025
eca0f32
bring buindings back
kpnovoselov Oct 13, 2025
aef4708
fixing syntax error
kpnovoselov Oct 13, 2025
7ec1748
enable other vendors
kpnovoselov Jan 7, 2026
bb2d3f9
build fixes
kpnovoselov Jan 7, 2026
765520c
remomve CLI
kpnovoselov Jan 7, 2026
6f8e147
regenerated cmake
kpnovoselov Jan 7, 2026
e38ae9e
imzML support
kpnovoselov Apr 9, 2023
3ef7270
cmake tools update
kpnovoselov Apr 10, 2023
539aff8
test github commit
kpnovoselov Nov 7, 2023
4febb81
changes pixels size x description
novoselov-mt Jan 15, 2024
161dd8d
Updated to new VS
novoselov-mt Jan 15, 2024
0aca178
quick fix for reddistr. Run script twice
novoselov-mt Jun 19, 2024
8d10e6d
msconvert-help.txt
novoselov-mt Jul 27, 2024
3b7874d
Minor changes to build scripts
novoselov-mt Aug 4, 2024
e2b9994
copy script has been added. j8 option has been removed
novoselov-mt Aug 4, 2024
ca6935c
ChromatogramList_LockmassRefinerTest and SpectrumList_PrecursorRecalc…
kpnovoselov May 22, 2025
6647267
more test were disabled
kpnovoselov May 22, 2025
2088d65
push test
novoselov-mt Oct 10, 2025
56e3e0c
more tests disabled
kpnovoselov Oct 10, 2025
d771dea
minor fix to jam
kpnovoselov Oct 10, 2025
944cabd
bindings were disabled
kpnovoselov Oct 13, 2025
aa8aaa7
bring buindings back
kpnovoselov Oct 13, 2025
df5d3a1
fixing syntax error
kpnovoselov Oct 13, 2025
0587354
enable other vendors
kpnovoselov Jan 7, 2026
385d21c
build fixes
kpnovoselov Jan 7, 2026
c70c09e
remomve CLI
kpnovoselov Jan 7, 2026
ffab703
regenerated cmake
kpnovoselov Jan 7, 2026
19d66b7
updated to current pwiz
kpnovoselov Jan 9, 2026
e539108
cleanup
kpnovoselov Jan 9, 2026
c8133ee
merged
kpnovoselov Jan 9, 2026
9397098
cleanup
kpnovoselov Jan 9, 2026
b833693
build tools fix
kpnovoselov Jan 9, 2026
36e8f70
Comment out test run commands in Jamfile
kpnovoselov Feb 8, 2026
3d5d3db
preserve LF for jam
novoselov-mt Mar 27, 2026
e928939
merged
kpnovoselov Aug 13, 2026
2c2e523
merged?
kpnovoselov Aug 13, 2026
0ec796a
build fixes
novoselov-mt Aug 13, 2026
1fc9e9d
Merge branch 'master' into ProteoWizard-master
kpnovoselov Aug 13, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
*.mzml binary
*.mzxml binary

*.sh text eol=lf
*.sh text eol=lf
*.jam text eol=lf
30 changes: 12 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,6 @@ _TeamCity*
*.coverage
*.coveragexml

# Visual Studio test playlists
*.playlist

# NCrunch
_NCrunch_*
.*crunch*.local.xml
Expand Down Expand Up @@ -229,11 +226,6 @@ PublishScripts/
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets
# Spurious NuGet.Config regenerated in a .nuget folder nested inside another
# .nuget folder (seen only on some machines, e.g. idpicker/.nuget/.nuget/); never
# part of the project. Anchored to the nested case so the tracked top-level
# idpicker/.nuget/ files (NuGet.Config, NuGet.exe, NuGet.targets) are unaffected.
**/.nuget/.nuget/

# Microsoft Azure Build Output
csx/
Expand Down Expand Up @@ -387,14 +379,11 @@ build-nt-x86
/libraries/msparser_*_win64
/libraries/msparser_*_linux64
/libraries/zlib*
/libraries/zstd*
Version.cpp
/pwiz_tools/BiblioSpec/tests/inputs
/pwiz_tools/BiblioSpec/tests/output
/pwiz_tools/SeeMS/**/AssemblyInfo.cs
/pwiz_tools/MSConvertGUI/**/AssemblyInfo.cs
/pwiz_tools/Osprey/**/AssemblyInfo.cs
/pwiz_tools/Osprey/dist/
/pwiz_tools/Bumbershoot/**/*Version.cpp
/pwiz_tools/Bumbershoot/**/AssemblyInfo.cpp
/pwiz_tools/Bumbershoot/**/AssemblyInfo.cs
Expand Down Expand Up @@ -442,7 +431,6 @@ SkylineTester Results
/b.bat
/b64.bat
/b32.bat
/bo*.bat
/bs.bat
/bs64.bat
/bs32.bat
Expand All @@ -465,9 +453,6 @@ SkylineTester Results
/pwiz_tools/Skyline/SkylineTester/Properties/AssemblyInfo.cs
/pwiz_tools/Skyline/TestRunner/Properties/AssemblyInfo.cs
/pwiz_tools/Skyline/Executables/SkylineBatch/SkylineBatch/Properties/AssemblyInfo.cs
/pwiz_tools/Skyline/Executables/AutoQC/AutoQC/Properties/AssemblyInfo.cs
/pwiz_tools/Skyline/Executables/Tools/SkylineMcp/SkylineAiConnector/Properties/AssemblyInfo.cs
/pwiz_tools/Skyline/Executables/Tools/SkylineMcp/SkylineMcpServer/Properties/AssemblyInfo.cs
/pwiz_tools/Skyline/Executables/Installer/FileList64.txt
/pwiz_tools/Skyline/TestSettings_x??.testsettings
/pwiz_tools/Skyline/SignAfterPublishPW.bat
Expand Down Expand Up @@ -497,7 +482,16 @@ SkylineTester Results
/tutorialTestNames.txt
/tests.txt
/pwiz_tools/Skyline/Translation/Scratch
pwiz/data/vendor_readers/Agilent/Reader_Agilent_Test.data/ImsSynthCCS.mz
pwiz/BrowseOnly/
coutd.txt
cout.txt
cerrd.txt
cerr.txt

mt_tools/copy_lib.cmd
mt_tools/pwiz-config-version.cmake
mt_tools/pwiz-config.cmake

/libraries/zstd-1.5.7/

# AI tooling junction (created by build with --ai flag)
/.claude
ai/
3 changes: 3 additions & 0 deletions mt_build.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
rem run from VC command prompt
quickbuild.bat address-model=64 --i-agree-to-the-vendor-licenses --without-shimadzu --abbreviate-paths pwiz msconvert

3 changes: 3 additions & 0 deletions mt_build_cvgen.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
quickbuild.bat address-model=64 --i-agree-to-the-vendor-licenses --without-bruker --without-sciex --without-shimadzu --without-waters -j8 --abbreviate-paths pwiz/data/common//cvgen


3 changes: 3 additions & 0 deletions mt_build_debug.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
rem run from VC command prompt
quickbuild.bat address-model=64 variant=debug --i-agree-to-the-vendor-licenses --without-shimadzu --abbreviate-paths pwiz msconvert

7 changes: 7 additions & 0 deletions mt_generate_cv.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
SET CVGEN_PATH=".\build-nt-x86\pwiz\data\common\msvc-14.3\rls\adrs-mdl-64\async-excpt-on\lnk-sttc\thrd-mlt"
SET OBO_PATH=".\pwiz\data\common"

%CVGEN_PATH%\cvgen.exe %OBO_PATH%\psi-ms.obo %OBO_PATH%\unimod.obo %OBO_PATH%\unit.obo %OBO_PATH%\imagingMS.obo

copy %CVGEN_PATH%\cv.hpp %OBO_PATH%
copy %CVGEN_PATH%\cv.cpp %OBO_PATH%
450 changes: 450 additions & 0 deletions mt_tools/copy_lib.cmd.in

Large diffs are not rendered by default.

450 changes: 450 additions & 0 deletions mt_tools/copy_lib.in

Large diffs are not rendered by default.

Loading