Revision: 77957
http://sourceforge.net/p/brlcad/code/77957
Author: starseeker
Date: 2020-12-10 18:21:22 +0000 (Thu, 10 Dec 2020)
Log Message:
-----------
Merge from trunk - r77953 through r77956
Modified Paths:
--------------
brlcad/branches/stepsync/NEWS
brlcad/branches/stepsync/misc/repoconv/github_ci_actions.yml
brlcad/branches/stepsync/src/libbrep/cdt/fast.cpp
brlcad/branches/stepsync/src/tclscripts/CMakeLists.txt
Property Changed:
----------------
brlcad/branches/stepsync/
brlcad/branches/stepsync/NEWS
Index: brlcad/branches/stepsync
===================================================================
--- brlcad/branches/stepsync 2020-12-10 18:19:50 UTC (rev 77956)
+++ brlcad/branches/stepsync 2020-12-10 18:21:22 UTC (rev 77957)
Property changes on: brlcad/branches/stepsync
___________________________________________________________________
Modified: svn:mergeinfo
## -10,4 +10,5 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/branches/tcltk86:68300-75257
\ No newline at end of property
+/brlcad/branches/tcltk86:68300-75257
+/brlcad/trunk:77953-77956
\ No newline at end of property
Modified: brlcad/branches/stepsync/NEWS
===================================================================
--- brlcad/branches/stepsync/NEWS 2020-12-10 18:19:50 UTC (rev 77956)
+++ brlcad/branches/stepsync/NEWS 2020-12-10 18:21:22 UTC (rev 77957)
@@ -13,6 +13,7 @@
--- 2020-xx-xx Release 7.32.2 ---
----------------------------------------------------------------------
+* fixed crash when trying to shade invalid breps - Cliff Yapp
* changed 'mvall' to rename all refs even w/ no object - Sean Morrison
* fixed MGED search command crash on empty database - Sean Morrison
* improved performance calculating BoT bounding boxes - Vikram Atreya
Property changes on: brlcad/branches/stepsync/NEWS
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,5 ##
/brlcad/branches/opencl/NEWS:65867-66137
/brlcad/branches/osg/NEWS:62110-62113
/brlcad/branches/prep-cache/NEWS:68236-68933
-/brlcad/branches/tcltk86/NEWS:68300-75257
\ No newline at end of property
+/brlcad/branches/tcltk86/NEWS:68300-75257
+/brlcad/trunk/NEWS:77953-77956
\ No newline at end of property
Modified: brlcad/branches/stepsync/misc/repoconv/github_ci_actions.yml
===================================================================
--- brlcad/branches/stepsync/misc/repoconv/github_ci_actions.yml
2020-12-10 18:19:50 UTC (rev 77956)
+++ brlcad/branches/stepsync/misc/repoconv/github_ci_actions.yml
2020-12-10 18:21:22 UTC (rev 77957)
@@ -35,7 +35,7 @@
- name: Configure
run: |
cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER="cl.exe" -D
CMAKE_CXX_COMPILER="cl.exe" -D ENABLE_ALL=ON -D CMAKE_BUILD_TYPE=Release
- #cmake -S . -B build -D CMAKE_C_COMPILER="cl.exe" -D
CMAKE_CXX_COMPILER="cl.exe" -D ENABLE_ALL=ON
+ #cmake -S . -B build -D ENABLE_ALL=ON
powershell Write-VolumeCache C
powershell Write-VolumeCache D
@@ -42,13 +42,14 @@
- name: Build
#run: cd build && ninja -j1 -v STEPCODE_BLD && cd
src/other/ext/STEPCODE_BLD-prefix/src/STEPCODE_BLD-build && ninja clean &&
ninja -j1 -v
#run: cmake --build build --config Release --target STEPCODE_BLD && cd
build/src/other/ext/STEPCODE_BLD-prefix/src/STEPCODE_BLD-build && msbuild
ALL_BUILD.vcxproj -t:clean && msbuild ALL_BUILD.vcxproj -v:diag
- run: cmake --build build --config Release --target package
+ run: cd build && ninja -j1 -v
+ #run: cmake --build build --config Release --target package
- - name: Upload Package
- uses: actions/upload-artifact@v2
- with:
- name: BRLCAD_Windows
- path: ${{ github.workspace }}/build/BRL-CAD*exe
+# - name: Upload Package
+# uses: actions/upload-artifact@v2
+# with:
+# name: BRLCAD_Windows
+# path: ${{ github.workspace }}/build/BRL-CAD*exe
linux:
name: Ubuntu Latest GCC
@@ -75,11 +76,11 @@
export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
cmake --build build --config Release --target package
- - name: Upload Package
- uses: actions/upload-artifact@v2
- with:
- name: BRLCAD_Linux
- path: ${{ github.workspace }}/build/BRL-CAD*gz
+# - name: Upload Package
+# uses: actions/upload-artifact@v2
+# with:
+# name: BRLCAD_Linux
+# path: ${{ github.workspace }}/build/BRL-CAD*gz
osx:
name: macOS Latest Clang
@@ -108,10 +109,10 @@
export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
cmake --build build --config Release --target package
- - name: Upload Package
- uses: actions/upload-artifact@v2
- with:
- name: BRLCAD_OSX
- path: ${{ github.workspace }}/build/BRL-CAD*gz
+# - name: Upload Package
+# uses: actions/upload-artifact@v2
+# with:
+# name: BRLCAD_OSX
+# path: ${{ github.workspace }}/build/BRL-CAD*gz
Modified: brlcad/branches/stepsync/src/libbrep/cdt/fast.cpp
===================================================================
--- brlcad/branches/stepsync/src/libbrep/cdt/fast.cpp 2020-12-10 18:19:50 UTC
(rev 77956)
+++ brlcad/branches/stepsync/src/libbrep/cdt/fast.cpp 2020-12-10 18:21:22 UTC
(rev 77957)
@@ -1944,17 +1944,19 @@
if (!brep->IsValid(&tl)) {
//for now try to draw even if it's invalid, but report if the
//user is listening
- if (vls && wstr.Length() > 0) {
- ON_String onstr = ON_String(wstr);
- const char *isvalidinfo = onstr.Array();
- bu_vls_strcat(vls, "brep (");
- bu_vls_strcat(vls, solid_name);
- bu_vls_strcat(vls, ") is NOT valid:");
- bu_vls_strcat(vls, isvalidinfo);
- } else {
- bu_vls_strcat(vls, "brep (");
- bu_vls_strcat(vls, solid_name);
- bu_vls_strcat(vls, ") is NOT valid.");
+ if (vls) {
+ if (wstr.Length() > 0) {
+ ON_String onstr = ON_String(wstr);
+ const char *isvalidinfo = onstr.Array();
+ bu_vls_strcat(vls, "brep (");
+ bu_vls_strcat(vls, solid_name);
+ bu_vls_strcat(vls, ") is NOT valid:");
+ bu_vls_strcat(vls, isvalidinfo);
+ } else {
+ bu_vls_strcat(vls, "brep (");
+ bu_vls_strcat(vls, solid_name);
+ bu_vls_strcat(vls, ") is NOT valid.");
+ }
}
}
Modified: brlcad/branches/stepsync/src/tclscripts/CMakeLists.txt
===================================================================
--- brlcad/branches/stepsync/src/tclscripts/CMakeLists.txt 2020-12-10
18:19:50 UTC (rev 77956)
+++ brlcad/branches/stepsync/src/tclscripts/CMakeLists.txt 2020-12-10
18:21:22 UTC (rev 77957)
@@ -38,7 +38,7 @@
set(tclindex_outdir
"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${DATA_DIR}/${targetdir}")
add_custom_command(
OUTPUT ${tclindex_outdir}/${outfile}
- COMMAND btclsh ${CMAKE_BINARY_DIR}/CMakeTmp/${cmd}.tcl
${tclindex_outdir} >> ${CMAKE_CURRENT_BINARY_DIR}/${cmd}_index_gen.log 2>&1
+ COMMAND btclsh ${CMAKE_BINARY_DIR}/CMakeTmp/${cmd}.tcl ${tclindex_outdir}
DEPENDS btclsh ${data_target_list} ${tcl_files}
)
@@ -64,9 +64,6 @@
list(REMOVE_DUPLICATES tclindex_target_list)
set(tclindex_target_list "${tclindex_target_list}" CACHE STRING "tclindex
target list" FORCE)
- set(LOG_FILES
"${LOG_FILES};${CMAKE_CURRENT_BINARY_DIR}/${cmd}_index_gen.log")
-
- DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/${cmd}_index_gen.log)
endif (BRLCAD_ENABLE_TCL)
endmacro(general_tcl_index_BUILD name targetdir)
mark_as_advanced(tclindex_target_list)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
