From 6eafb4b041ad79cb936b2041fdb9c56b1209cc10 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 19 Jun 2015 15:36:52 -0400 Subject: [PATCH] Replace a few references to Subversion with Git. There are a whole bunch more of these around, but these were the ones I was confident replacing. --- build/jam/UserBuildConfig.ReadMe | 6 +++--- data/config/boot/UserSetupEnvironment.sample | 7 ++----- src/system/libroot/os/system_revision.c | 2 +- src/tools/checkstyle/checkstyle.py | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/build/jam/UserBuildConfig.ReadMe b/build/jam/UserBuildConfig.ReadMe index e3b13fc21e..0fd6ad3c16 100644 --- a/build/jam/UserBuildConfig.ReadMe +++ b/build/jam/UserBuildConfig.ReadMe @@ -2,7 +2,7 @@ # ---------------------- # UserBuildConfig can be used to customize the build according to your needs. -# If existent it is included by the build system, but it is ignored by svn. +# If existent it is included by the build system, but it is ignored by Git. # This file documents a few examples, what can be done. Don't just rename it # to UserBuildConfig -- you don't want all the things to happen, that are # specified here. Rather create an empty UserBuildConfig and copy the lines @@ -125,7 +125,7 @@ AddSourceDirectoryToHaikuImage src/tests/servers/debug : alwaysUpdate ; # Copy the jam sources (assuming they are located ../buildtools/jam relatively # to your Haiku sources) to the image as /boot/home/Desktop/jam-src, excluding -# any file or directory named ".svn" and any source path that matches the +# any file or directory named ".git" and any source path that matches the # pattern "*/jam/./bin.*". Note that the "*" character needs to be escaped with # two backslashes (one because it goes through a shell and one to quote the # first one in jam), and that the build system always appends "/." to the source @@ -134,7 +134,7 @@ AddSourceDirectoryToHaikuImage src/tests/servers/debug : alwaysUpdate ; # also be copied in update mode. CopyDirectoryToHaikuImage home Desktop : $(HAIKU_TOP)/../buildtools/jam - : "jam-src" : -x .svn -X \\*/jam/./bin.\\* ; + : "jam-src" : -x .git -X \\*/jam/./bin.\\* ; # Extracts the given archive onto the image under /boot/develop/tools. ExtractArchiveToHaikuImage develop tools diff --git a/data/config/boot/UserSetupEnvironment.sample b/data/config/boot/UserSetupEnvironment.sample index f263108af3..cdec764e30 100644 --- a/data/config/boot/UserSetupEnvironment.sample +++ b/data/config/boot/UserSetupEnvironment.sample @@ -1,12 +1,9 @@ -# Quick start for file UserSetupEnvironment. Copy or rename this file as +# Quick start for file UserSetupEnvironment. Copy or rename this file as # "/boot/home/config/boot/UserSetupEnvironment". # Add custom environment variables to initialize -# This file is a standard bash script. For more information regarding shell +# This file is a standard bash script. For more information regarding shell # scripts, refer to any online documentation for "bash scripting" -# set Pe as the default svn editor for entering commit logs. -# export SVN_EDITOR=lpe - # Set important variables # export IS_COMPUTER_ON=1 diff --git a/src/system/libroot/os/system_revision.c b/src/system/libroot/os/system_revision.c index 08172c32f8..a4b00bdbd5 100644 --- a/src/system/libroot/os/system_revision.c +++ b/src/system/libroot/os/system_revision.c @@ -7,7 +7,7 @@ #include -// Haiku SVN revision. Will be set when copying libroot.so to the image. +// Haiku revision (hrev). Will be set when copying libroot.so to the image. // Lives in a separate section so that it can easily be found. static char sHaikuRevision[SYSTEM_REVISION_LENGTH] __attribute__((section("_haiku_revision"))); diff --git a/src/tools/checkstyle/checkstyle.py b/src/tools/checkstyle/checkstyle.py index 3cdcee1c7f..64d5816a3e 100644 --- a/src/tools/checkstyle/checkstyle.py +++ b/src/tools/checkstyle/checkstyle.py @@ -37,7 +37,7 @@ def run(fileSet, rules, outputFileName): def visit(result, dir, names): extensions = [".cpp", ".h"] - names.remove(".svn") + names.remove(".git") for name in names: path = os.path.join(dir, name) if os.path.isfile(path) and os.path.splitext(name)[1] in extensions: