From 63e36acab4c8e1590e291494053edb3cb9bff43b Mon Sep 17 00:00:00 2001 From: Cheng Date: Sun, 18 Sep 2022 17:57:42 +1000 Subject: [PATCH] minor cleanup of git attributes and set_upstream --- .gitattributes | 17 ++++++++-------- docs/set_upstream.sh | 46 ++++++++++++++++++++++---------------------- msvc/winConfig.bat | 2 +- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/.gitattributes b/.gitattributes index d5d380e..3c93bcf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,24 +1,25 @@ ############################################################################### # Handle line endings automatically for files detected as text # and leave all files detected as binary untouched. -* text=auto # Force the following filetypes to have unix eols and encoding, so that Windows does not break them. # If a file is going to be used on linux and windows, we want it invariant, # rather than automatically translated, because automatic translation always screw things up. -* text=auto eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +* text=auto eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 .gitignore text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 .gitattributes text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 .gitmodules text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.sh text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.sh text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=bash *.c text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.cpp text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.cpp text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=cpp +*.rs text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=rust +*.py text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=python *.h text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 *.txt text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.html text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.htm text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.md text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.html text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=html +*.htm text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=html +*.md text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=markdown *.pandoc text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 -*.css text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 +*.css text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff=css *.manifest text eol=lf encoding=utf-8 whitespace=trailing-space,space-before-tab,tabwidth=4 diff --git a/docs/set_upstream.sh b/docs/set_upstream.sh index 0d49cc9..bb7c4b3 100644 --- a/docs/set_upstream.sh +++ b/docs/set_upstream.sh @@ -3,50 +3,50 @@ set -e set -x echo intended to be run in the event of moving repositories git remote -v -git remote set-url --push upstream git@rho.la:~/wallet.git +git remote set-url --push origin git@rho.la:~/wallet.git git submodule foreach --recursive 'git remote -v' cd libsodium -git remote set-url --push upstream git@rho.la:~/mpir.git -git remote set-url upstream https://github.com/jedisct1/libsodium.git +git remote set-url --push origin git@rho.la:~/mpir.git +git remote set-url origin https://github.com/jedisct1/libsodium.git cd .. cd mpir -git remote set-url --push upstream git@rho.la:~/mpir.git -git remote set-url upstream https://github.com/BrianGladman/mpir.git +git remote set-url --push origin git@rho.la:~/mpir.git +git remote set-url origin https://github.com/BrianGladman/mpir.git cd .. cd wxWidgets -git remote set-url --push upstream git@rho.la:~/wxWidgets.git -git remote set-url upstream https://github.com/wxWidgets/wxWidgets.git +git remote set-url --push origin git@rho.la:~/wxWidgets.git +git remote set-url origin https://github.com/wxWidgets/wxWidgets.git cd .. cd wxWidgets/3rdparty/catch -git remote set-url --push upstream git@rho.la:~/Catch.git -git remote set-url upstream https://github.com/wxWidgets/Catch.git +git remote set-url --push origin git@rho.la:~/Catch.git +git remote set-url origin https://github.com/wxWidgets/Catch.git cd ../../.. cd wxWidgets/3rdparty/nanosvg -git remote set-url --push upstream git@rho.la:~/nanosvg -git remote set-url upstream https://github.com/wxWidgets/nanosvg +git remote set-url --push origin git@rho.la:~/nanosvg +git remote set-url origin https://github.com/wxWidgets/nanosvg cd ../../.. cd wxWidgets/3rdparty/pcre -git remote set-url --push upstream git@rho.la:~/pcre -git remote set-url upstream https://github.com/wxWidgets/pcre +git remote set-url --push origin git@rho.la:~/pcre +git remote set-url origin https://github.com/wxWidgets/pcre cd ../../.. cd wxWidgets/src/expat -git remote set-url --push upstream git@rho.la:~/libexpat.git -git remote set-url upstream https://github.com/wxWidgets/libexpat.git +git remote set-url --push origin git@rho.la:~/libexpat.git +git remote set-url origin https://github.com/wxWidgets/libexpat.git cd ../../.. cd wxWidgets/src/jpeg -git remote set-url --push upstream git@rho.la:~/libjpeg-turbo.git -git remote set-url upstream https://github.com/wxWidgets/libjpeg-turbo.git +git remote set-url --push origin git@rho.la:~/libjpeg-turbo.git +git remote set-url origin https://github.com/wxWidgets/libjpeg-turbo.git cd ../../.. cd wxWidgets/src/png -git remote set-url --push upstream git@rho.la:~/libpng.git -git remote set-url upstream https://github.com/wxWidgets/libpng.git +git remote set-url --push origin git@rho.la:~/libpng.git +git remote set-url origin https://github.com/wxWidgets/libpng.git cd ../../.. cd wxWidgets/src/tiff -git remote set-url --push upstream git@rho.la:~/libtiff.git -git remote set-url upstream https://github.com/wxWidgets/libtiff.git +git remote set-url --push origin git@rho.la:~/libtiff.git +git remote set-url origin https://github.com/wxWidgets/libtiff.git cd ../../.. cd wxWidgets/src/zlib -git remote set-url --push upstream git@rho.la:~/zlib.git -git remote set-url upstream https://github.com/wxWidgets/zlib.git +git remote set-url --push origin git@rho.la:~/zlib.git +git remote set-url origin https://github.com/wxWidgets/zlib.git cd ../../.. winConfigure.sh diff --git a/msvc/winConfig.bat b/msvc/winConfig.bat index fb3fff9..f07f430 100644 --- a/msvc/winConfig.bat +++ b/msvc/winConfig.bat @@ -1,4 +1,4 @@ -echo off +echo on call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2022\BuildTools\VC\Auxiliary\Build\vcvarsamd64_x86.bat call C:\"Program Files"\"Microsoft Visual Studio"\2022\Community\VC\Auxiliary\Build\vcvars64.bat" echo on