Revision: 77934
http://sourceforge.net/p/brlcad/code/77934
Author: starseeker
Date: 2020-12-05 19:29:08 +0000 (Sat, 05 Dec 2020)
Log Message:
-----------
Merge from trunk - r77923 through r77933
Modified Paths:
--------------
brlcad/branches/extbuild/misc/CMake/scripts/tcl_mkindex.cmake
brlcad/branches/extbuild/misc/repoconv/NOTES
Property Changed:
----------------
brlcad/branches/extbuild/
brlcad/branches/extbuild/src/other/
Index: brlcad/branches/extbuild
===================================================================
--- brlcad/branches/extbuild 2020-12-05 18:26:54 UTC (rev 77933)
+++ brlcad/branches/extbuild 2020-12-05 19:29:08 UTC (rev 77934)
Property changes on: brlcad/branches/extbuild
___________________________________________________________________
Modified: svn:mergeinfo
## -11,4 +11,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:77547-77923
\ No newline at end of property
+/brlcad/trunk:77547-77933
\ No newline at end of property
Modified: brlcad/branches/extbuild/misc/CMake/scripts/tcl_mkindex.cmake
===================================================================
--- brlcad/branches/extbuild/misc/CMake/scripts/tcl_mkindex.cmake
2020-12-05 18:26:54 UTC (rev 77933)
+++ brlcad/branches/extbuild/misc/CMake/scripts/tcl_mkindex.cmake
2020-12-05 19:29:08 UTC (rev 77934)
@@ -31,11 +31,24 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#=============================================================================
-
get_filename_component(TFD "${TF_DIR}" REALPATH)
-file(WRITE "${WORKING_PKGFILE}" "package ifneeded ${pkgname} ${pkgversion}
[list load [file join $dir \"${TFD}\" ${TF_NAME}] ${pkgname}]")
-file(WRITE "${INSTALL_PKGFILE}" "package ifneeded ${pkgname} ${pkgversion}
[list load [file join $dir .. .. \"${INST_DIR}\" ${TF_NAME}] ${pkgname}]")
+# file(WRITE) is digesting the paths and producing incorrect directories
+# when there are spaces in paths. To avoid this, use get_filename_component
+# to "pre-digest" the paths and then correct any "/ " patterns introduced.
+get_filename_component(WFD "${WORKING_PKGFILE}" DIRECTORY)
+get_filename_component(WFN "${WORKING_PKGFILE}" NAME)
+string(REPLACE "/ " " " WFD "${WFD}")
+file(WRITE "${WFD}/${WFN}" "package ifneeded ${pkgname} ${pkgversion} [list
load [file join $dir \"${TFD}\" ${TF_NAME}] ${pkgname}]")
+
+# file(WRITE) is digesting the paths and producing incorrect directories
+# when there are spaces in paths. To avoid this, use get_filename_component
+# to "pre-digest" the paths and then correct any "/ " patterns introduced.
+get_filename_component(WFD "${INSTALL_PKGFILE}" DIRECTORY)
+get_filename_component(WFN "${INSTALL_PKGFILE}" NAME)
+string(REPLACE "/ " " " WFD "${WFD}")
+file(WRITE "${WFD}/${WFN}" "package ifneeded ${pkgname} ${pkgversion} [list
load [file join $dir .. .. \"${INST_DIR}\" ${TF_NAME}] ${pkgname}]")
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/extbuild/misc/repoconv/NOTES
===================================================================
--- brlcad/branches/extbuild/misc/repoconv/NOTES 2020-12-05 18:26:54 UTC
(rev 77933)
+++ brlcad/branches/extbuild/misc/repoconv/NOTES 2020-12-05 19:29:08 UTC
(rev 77934)
@@ -314,3 +314,15 @@
cd brlcad && git checkout master
git fast-export --all --show-original-ids > ../brlcad.fi
+
+#############################################################################
+Other large scale git conversions:
+https://web.archive.org/web/20130327012743/https://techbase.kde.org/Projects/MovetoGit
+https://techbase.kde.org/Projects/MovetoGit
+https://blog.runtux.com/posts/2014/04/18/233/
+https://blogs.ed.ac.uk/timc/2017/11/24/migrating-from-svn-to-git-while-splitting-repository/
+http://esr.ibiblio.org/?p=5634
+http://esr.ibiblio.org/?p=6792
+http://esr.ibiblio.org/?p=8607
+https://gitlab.com/ideasman42/blender-git-migration/
+
Index: brlcad/branches/extbuild/src/other
===================================================================
--- brlcad/branches/extbuild/src/other 2020-12-05 18:26:54 UTC (rev 77933)
+++ brlcad/branches/extbuild/src/other 2020-12-05 19:29:08 UTC (rev 77934)
Property changes on: brlcad/branches/extbuild/src/other
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,4 ##
/brlcad/branches/osg/src/other:62110-62113
/brlcad/branches/prep-cache/src/other:68236-68933
/brlcad/branches/tcltk86/src/other:68300-75257
-/brlcad/trunk/src/other:77547-77657,77836-77857,77870-77920
\ No newline at end of property
+/brlcad/trunk/src/other:77547-77657,77836-77857,77870-77920,77924-77933
\ No newline at end of property
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
