Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skyline/work/20180529 move to net472 #82

Merged
merged 84 commits into from Aug 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
0c7daf0
Move Skyline from to .Net framework 4.5.1 to 4.5.2.
May 18, 2018
3d3442f
- added Shimadzu QTOF reader (still using old DataReader.dll because …
chambm Mar 21, 2018
391788b
Merge remote-tracking branch 'remotes/origin/master' into Skyline/wor…
May 22, 2018
b194a15
* cleaned up WXS templates by removing redundant Name and Id attributes
chambm May 22, 2018
c9d4b03
* added missing DLLs back to vendor_api_Shimadzu.7z and added Shimadz…
chambm May 23, 2018
bd7f054
* restored correct version of x86 DataReader.dll
chambm May 23, 2018
be49000
* added TIC chromatogram for TOF
chambm May 29, 2018
44be388
Move Skyline to .net 4.72
May 29, 2018
6a2ab19
Merge remote-tracking branch 'remotes/origin/master' into Skyline/wor…
May 29, 2018
c7be1b4
Merge remote-tracking branch 'remotes/origin/feature/Shimadzu-TOF' in…
May 29, 2018
c1e1c9e
* fixed getAnalysisDate() returning different time for different host…
chambm May 29, 2018
47df146
Move more projects to 4.72
May 29, 2018
963f442
Update Google.Protobuf.dll to version 3.5
May 29, 2018
0ef14d7
Merge branch 'master' into Skyline/work/20180529_MoveToNet472
nickshulman May 29, 2018
58d5cff
Merge remote-tracking branch 'remotes/origin/feature/Shimadzu-TOF' in…
May 29, 2018
8f51c34
Merge branch 'master' into Skyline/work/20180529_MoveToNet472
nickshulman May 30, 2018
9d2c4e2
Move Topograph to .Net 4.7.2
May 30, 2018
2e4b170
Merge branch 'master' into Skyline/work/20180529_MoveToNet472
nickshulman May 30, 2018
825a34c
Branch for enabling building with Visual Studio 2015
Sep 26, 2016
e748f20
Empty commit message
Sep 27, 2016
0a9d18b
Empty commit message
Sep 27, 2016
744429b
Fix 32 bit build.
Sep 27, 2016
9591684
Undefine "H5_HAVE_TIMEZONE" in order to fix VS2015 build.
Sep 29, 2016
a5bcc35
- updated to Boost 1.62 and added support for building with msvc-14.0
Oct 12, 2016
eaa2035
- fix GCC compile
Oct 14, 2016
19e403c
- fixed quickbuild not working with spaces in path
Dec 13, 2016
0c559bd
[pwiz VS2015 compatibility branch]: Updating pwiz RAMPAdapter to prov…
Feb 7, 2017
2c86c96
* updated project files to Visual Studio 2017 (msvc-14.1)
chambm Jun 6, 2018
b36e586
* added msvc_setup_script.bat for actions which need to access VS com…
chambm Jun 7, 2018
b292cc8
* restored customizations to testing.jam
chambm Jun 8, 2018
4601c69
* updated appveyor.yml
chambm Jun 8, 2018
71baca7
* reverted Boost.Build changes due to broken make/copy behavior
chambm Jun 8, 2018
3effad8
* restored fix to empty SHELL invocation
chambm Jun 8, 2018
9fd5e1c
* fixed Linux compile errors
chambm Jun 8, 2018
61f963b
* removed boost.regex from Bumbershoot due to conflict with new Masco…
chambm Jun 11, 2018
1da31d1
* replaced boost.regex with boost.xpressive in LibraryBabelFish
chambm Jun 11, 2018
864c1c9
Merge branch 'master' into Skyline/work/20180529_MoveToNet472
chambm Jun 13, 2018
cc4d26b
Merge remote-tracking branch 'remotes/origin/feature/VS2017-update' i…
chambm Jun 13, 2018
ecf8ac0
Merge branch 'Skyline/work/20180529_MoveToNet472' of github.com:Prote…
chambm Jun 13, 2018
1f94119
* changed build-apps.bat to use --abbreviate-paths instead of --hash,…
chambm Jun 13, 2018
7545c87
* fixed error trying to create directory '.' (apparently ignored in B…
chambm Jun 13, 2018
0bbdb72
* restored separate core/platform-dependent Shimadzu install targets
chambm Jun 13, 2018
34b2ae7
Revert "* reverted Boost.Build changes due to broken make/copy behavior"
chambm Jun 13, 2018
3f9fdff
Merge from master, so Skyline tests with audit logging won't fail in …
bspratt Jun 19, 2018
2b0e29c
SkylineNightly: dynamically set the bjam toolset value based on Targe…
bspratt Jun 20, 2018
8ab4435
Revert "SkylineNightly: dynamically set the bjam toolset value based …
bspratt Jun 20, 2018
e87be7b
* fixed Topograph and IDPicker tests for VS 2017
chambm Jul 6, 2018
50e72f4
Merge branch 'master' into Skyline/work/20180529_MoveToNet472
chambm Jul 6, 2018
92e2b27
* fixed 'libhdf5.settings: No such file or directory' error on Linux
chambm Jul 6, 2018
8f74cd5
* fixed missing calls to MSVC_CURRENT_SETUP_SCRIPT
chambm Jul 6, 2018
7a30463
* fixed BiblioSpec openswath/maxquant tests on Linux
chambm Jul 9, 2018
694aa64
Skyline: put more of test exit code in try-catch block to attempt to …
bspratt Jul 9, 2018
012195b
Skyline: still trying to track down problem with early overnight test…
bspratt Jul 10, 2018
676e3c7
* added --force-extract option for re-extracting tarballs
chambm Jul 11, 2018
277c14f
* fixed IDPicker dependency issues with installer (I hope)
chambm Jul 11, 2018
ea54be4
* fixed IDPicker dependency issues with installer (I hope)
chambm Jul 12, 2018
44d369c
* added --force-generate-version to override --incremental
chambm Jul 12, 2018
a814f7d
Updating VS2017 branch from HEAD
bspratt Jul 18, 2018
783b718
Fix a problem where the SkylineNightly zip installer could fail due t…
bspratt Jul 18, 2018
0a601e9
* added MSVC14 merge modules to IDPicker installer
chambm Jul 19, 2018
c20a6d6
Merge remote-tracking branch 'remotes/origin/master' into feature/VS2…
bspratt Jul 25, 2018
15d1748
More robust error handling for SkylineTester installer zip file creation
bspratt Jul 25, 2018
a851627
* moved all .NET projects 4.7.2
May 18, 2018
471520a
Merge branch 'Skyline/work/20180529_MoveToNet472' of github.com:Prote…
chambm Jul 25, 2018
7c064bc
* reduced verbosity in MSVC build log by filtering out compiled file …
chambm Jul 25, 2018
143c93a
Merge remote-tracking branch 'remotes/origin/feature/VS2017-update' i…
chambm Jul 25, 2018
bb12a0d
* fixed Shimadzu Jamfile
chambm Jul 25, 2018
e9649fa
Merge branch 'master' into Skyline/work/20180529_MoveToNet472
chambm Jul 30, 2018
fc748de
* fixed outdated Shimadzu mzML in PwizFileInfoTest.zip
chambm Aug 2, 2018
213a93a
Merge branch 'master' into Skyline/work/20180529_MoveToNet472
bspratt Aug 2, 2018
c151340
Merge branch 'master' into Skyline/work/20180529_MoveToNet472
bspratt Aug 3, 2018
ee53b94
* moved all .NET projects 4.7.2
May 18, 2018
b3c7607
* fixed Shimadzu Jamfile
chambm Jul 25, 2018
33176b6
* fixed outdated Shimadzu mzML in PwizFileInfoTest.zip
chambm Aug 2, 2018
f39294a
* fixed Skyline.passed actions (hopefully)
chambm Aug 8, 2018
467d14f
* fixed SkylineNightly.zip build (was missing SkylineNightlyShim)
chambm Aug 8, 2018
29f3a03
Merge branch 'Skyline/work/20180529_MoveToNet472' of github.com:Prote…
chambm Aug 8, 2018
1bb7ac6
Merge branch 'master' into Skyline/work/20180529_MoveToNet472
chambm Aug 9, 2018
3c0e38c
SkylineTester: when scripted nightly build encounters trouble deletin…
bspratt Aug 13, 2018
9ac5a78
Merge branch 'Skyline/work/20180529_MoveToNet472' of https://github.c…
bspratt Aug 13, 2018
ec960da
SkylineNightly: change an overly specific expection catcher for deali…
bspratt Aug 13, 2018
e6f04f6
SkylineTester: attempt to solve unattended nightly build problem wher…
bspratt Aug 14, 2018
7ea7e82
Merge branch 'master' into Skyline/work/20180529_MoveToNet472
bspratt Aug 14, 2018
8cf757a
Merge branch 'master' into Skyline/work/20180529_MoveToNet472
chambm Aug 15, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
182 changes: 98 additions & 84 deletions Jamroot.jam

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions appveyor.yml
@@ -1,7 +1,9 @@
version: '{build}.{branch}'
clone_depth: 1
skip_branch_with_pr: true
image: Visual Studio 2017
clone_depth: 5
build_script:
- ps: '& .\quickbuild.bat address-model=64 --i-agree-to-the-vendor-licenses -j2 --abbreviate-paths pwiz executables toolset=msvc-12.0'
- ps: '& .\quickbuild.bat address-model=64 --i-agree-to-the-vendor-licenses -j2 --abbreviate-paths pwiz executables toolset=msvc-14.1'
test: off

skip_commits:
Expand Down
3 changes: 2 additions & 1 deletion clean.bat
Expand Up @@ -9,7 +9,7 @@ if /I "%1"=="-q" set VERBOSE=0
REM # Get the location of quickbuild.bat and drop trailing slash
set PWIZ_ROOT=%~dp0
set PWIZ_ROOT=%PWIZ_ROOT:~0,-1%
pushd %PWIZ_ROOT%
pushd "%PWIZ_ROOT%"

if %VERBOSE%==1 echo Cleaning build directories...
IF EXIST build-nt-x86 rmdir /s /q build-nt-x86
Expand All @@ -21,6 +21,7 @@ IF EXIST libraries\boost-build\src\engine\bootstrap rmdir /s /q libraries\boost-
IF EXIST libraries\boost_1_43_0 rmdir /s /q libraries\boost_1_43_0
IF EXIST libraries\boost_1_54_0 rmdir /s /q libraries\boost_1_54_0
IF EXIST libraries\boost_1_56_0 rmdir /s /q libraries\boost_1_56_0
IF EXIST libraries\boost_1_67_0 rmdir /s /q libraries\boost_1_67_0
IF EXIST libraries\gd-2.0.33 rmdir /s /q libraries\gd-2.0.33
IF EXIST libraries\zlib-1.2.3 rmdir /s /q libraries\zlib-1.2.3
IF EXIST libraries\libgd-2.1.0alpha rmdir /s /q libraries\libgd-2.1.0alpha
Expand Down
2 changes: 1 addition & 1 deletion libraries/SQLite/sqlite3pp.h
Expand Up @@ -43,7 +43,7 @@ namespace sqlite3pp
class aggregate;
}

class null_type {};
struct null_type { bool operator==(const null_type&) const { return true; } };
extern null_type ignore;

int enable_shared_cache(bool fenable);
Expand Down