[med-svn] [Git][med-team/castxml][upstream] New upstream version 0.3.4

[Andreas Tille]

Andreas Tille pushed to branch upstream at Debian Med / castxml


Commits:
edf3926f by Andreas Tille at 2020-08-02T19:26:33+02:00
New upstream version 0.3.4
- - - - -


7 changed files:

- src/Detect.cxx
- src/Version.cmake
- test/CMakeLists.txt
- test/expect/cmd.cc-msvc-tgt-amd64.stderr.txt
- test/expect/cmd.cc-msvc-tgt-i386.stderr.txt
- test/expect/cmd.cc-msvc-tgt-win.stderr.txt
- test/expect/cmd.cc-msvc-tgt-x86_64.stderr.txt


Changes:

=====================================
src/Detect.cxx
=====================================
@@ -96,6 +96,9 @@ static void setTriple(Options& opts)
     triple.setVendorName("pc");
     triple.setOSName("windows");
   }
+  if (pd.find("#define _MSC_VER ") != pd.npos) {
+    triple.setEnvironmentName("msvc");
+  }
   if (pd.find("#define __MINGW32__ 1") != pd.npos) {
     triple.setEnvironmentName("gnu");
   }


=====================================
src/Version.cmake
=====================================
@@ -1,7 +1,7 @@
 # CastXML version number components.
 set(CastXML_VERSION_MAJOR 0)
 set(CastXML_VERSION_MINOR 3)
-set(CastXML_VERSION_PATCH 3)
+set(CastXML_VERSION_PATCH 4)
 set(CastXML_VERSION_RC 0)
 set(CastXML_VERSION_IS_DIRTY 0)
 
@@ -13,7 +13,7 @@ if(CastXML_VERSION_RC)
 endif()
 
 # If this source was exported by 'git archive', use its commit info.
-set(git_info "204ecd2 CastXML 0.3.3")
+set(git_info "3dc416a CastXML 0.3.4")
 
 # Otherwise, try to identify the current development source version.
 if(NOT git_info MATCHES "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]?[0-9a-f]?)[0-9a-f]* "


=====================================
test/CMakeLists.txt
=====================================
@@ -400,7 +400,9 @@ castxml_test_cmd(cc-msvc-std-explicit --castxml-cc-msvc "(" $<TARGET_FILE:cc-msv
 castxml_test_cmd(cc-msvc-builtin-1800-E --castxml-cc-msvc "(" $<TARGET_FILE:cc-msvc> -msc=1800 ")" ${empty_cxx} -E -dM)
 castxml_test_cmd(cc-msvc-builtin-1900-E --castxml-cc-msvc "(" $<TARGET_FILE:cc-msvc> -msc=1900 ")" ${empty_cxx} -E -dM)
 castxml_test_cmd(cc-msvc-builtin-1900 --castxml-cc-msvc "(" $<TARGET_FILE:cc-msvc> -msc=1900 ")" ${input}/make_integer_seq.cxx)
-castxml_test_cmd(cc-msvc-builtin-1923 --castxml-cc-msvc "(" $<TARGET_FILE:cc-msvc> -msc=1923 ")" ${input}/assume_aligned.cxx)
+if(";${LLVM_TARGETS_TO_BUILD};" MATCHES ";X86;")
+  castxml_test_cmd(cc-msvc-builtin-1923 --castxml-cc-msvc "(" $<TARGET_FILE:cc-msvc> -msc=1923 --cc-define=_M_X64 ")" ${input}/assume_aligned.cxx)
+endif()
 castxml_test_cmd(cc-msvc-c-bad-cmd --castxml-cc-msvc-c "(" cc-msvc-c-bad-cmd ")" ${empty_c})
 castxml_test_cmd(cc-msvc-c-src-c-E --castxml-cc-msvc-c $<TARGET_FILE:cc-msvc> ${empty_c} -E -dM)
 castxml_test_cmd(cc-msvc-c-src-c-cmd --castxml-cc-msvc-c $<TARGET_FILE:cc-msvc> ${empty_c} "-###")


=====================================
test/expect/cmd.cc-msvc-tgt-amd64.stderr.txt
=====================================
@@ -1,3 +1,4 @@
 Target: amd64-[^
-]+
+]+-msvc[^
+]*
 .


=====================================
test/expect/cmd.cc-msvc-tgt-i386.stderr.txt
=====================================
@@ -1,3 +1,4 @@
 Target: i386-[^
-]+
+]+-msvc[^
+]*
 .


=====================================
test/expect/cmd.cc-msvc-tgt-win.stderr.txt
=====================================
@@ -1,4 +1,4 @@
 Target: [^
--]+-pc-windows[^
+-]+-pc-windows-msvc[^
 ]*
 .


=====================================
test/expect/cmd.cc-msvc-tgt-x86_64.stderr.txt
=====================================
@@ -1,3 +1,4 @@
 Target: x86_64-[^
-]+
+]+-msvc[^
+]*
 .



View it on GitLab: https://salsa.debian.org/med-team/castxml/-/commit/edf3926f9adff8591a502443718d79fef3f1202f

-- 
View it on GitLab: https://salsa.debian.org/med-team/castxml/-/commit/edf3926f9adff8591a502443718d79fef3f1202f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200802/86713f47/attachment-0001.html>