change branding to ericw-tools

2017-10-19 16:29:32 -06:00 · 2017-10-19 16:29:32 -06:00 · b85d627c8f
parent 7a7d3b843c
commit b85d627c8f
19 changed files with 37 additions and 37 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -25,5 +25,5 @@ deploy:
    - "build-osx/*.zip"
    - "build/*.zip"
  on:
-    repo: ericwa/tyrutils-ericw
+    repo: ericwa/ericw-tools
    tags: true
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 2.8)
-project (tyrutils)
+project (ericw-tools)

 # Grab the git describe output and store it in GIT_DESCRIBE
 # Thanks to http://xit0.org/2013/04/cmake-use-git-branch-and-commit-details-in-project/
@ -108,7 +108,7 @@ else ()
 	set(CMAKE_C_STANDARD 99)
 endif ()

-add_definitions(-DTYRUTILS_VERSION=${GIT_DESCRIBE})
+add_definitions(-DERICWTOOLS_VERSION=${GIT_DESCRIBE})

 if (MSVC)
 	add_definitions("/DWIN32")
@ -140,6 +140,6 @@ install(FILES changelog.txt DESTINATION bin)
 #CPack configuration

 set(CPACK_GENERATOR ZIP)
-set(CPACK_PACKAGE_NAME tyrutils)
+set(CPACK_PACKAGE_NAME ericw-tools)
 set(CPACK_PACKAGE_VERSION ${GIT_DESCRIBE})
 include(CPack)
--- a/README.md
+++ b/README.md
@ -1,5 +1,5 @@
-## tyrutils-ericw
- - Website:         http://ericwa.github.io/tyrutils-ericw
+## ericw-tools
+ - Website:         http://ericwa.github.io/ericw-tools
 - Maintainer:      Eric Wasylishen (AKA ericw)
 - Email:           ewasylishen@gmail.com

@ -9,12 +9,12 @@
 - Author:  Kevin Shanahan (AKA Tyrann)
 - Email:   tyrann@disenchant.net

-[![Build Status](https://travis-ci.org/ericwa/tyrutils-ericw.svg?branch=master)](https://travis-ci.org/ericwa/tyrutils-ericw)
-[![Build status](https://ci.appveyor.com/api/projects/status/7lpdcy7l3e840u70?svg=true)](https://ci.appveyor.com/project/EricWasylishen/tyrutils-ericw)
+[![Build Status](https://travis-ci.org/ericwa/ericw-tools.svg?branch=master)](https://travis-ci.org/ericwa/ericw-tools)
+[![Build status](https://ci.appveyor.com/api/projects/status/7lpdcy7l3e840u70?svg=true)](https://ci.appveyor.com/project/EricWasylishen/ericw-tools)

 ## About

-tyrutils-ericw is a branch of Tyrann's quake 1 tools, focused on
+ericw-tools is a branch of Tyrann's quake 1 tools, focused on
 adding lighting features, mostly borrowed from q3map2. There are a few
 bugfixes for qbsp as well. Original readme follows:

@ -36,7 +36,7 @@ Included utilities:

 See the doc/ directory for more detailed descriptions of the various
 tools capabilities.  See changelog.txt for a brief overview of recent
-changes or https://github.com/ericwa/tyrutils-ericw for the full changelog and
+changes or https://github.com/ericwa/ericw-tools for the full changelog and
 source code.

 ## Compiling
@ -55,8 +55,8 @@ Tested on:
 ```
 sudo apt-get install git cmake build-essential groff

-git clone https://github.com/ericwa/tyrutils-ericw
-cd tyrutils-ericw
+git clone https://github.com/ericwa/ericw-tools
+cd ericw-tools

 mkdir build
 cd build
@ -70,11 +70,11 @@ make -j8 VERBOSE=1

 Executables will be located in:

- - `tyrutils-ericw/build/qbsp/qbsp`
- - `tyrutils-ericw/build/vis/vis`
- - `tyrutils-ericw/build/light/light`
- - `tyrutils-ericw/build/bspinfo/bspinfo`
- - `tyrutils-ericw/build/bsputil/bsputil`
+ - `ericw-tools/build/qbsp/qbsp`
+ - `ericw-tools/build/vis/vis`
+ - `ericw-tools/build/light/light`
+ - `ericw-tools/build/bspinfo/bspinfo`
+ - `ericw-tools/build/bsputil/bsputil`

 ## Credits

--- a/appveyor.yml
+++ b/appveyor.yml
@ -26,9 +26,9 @@ build_script:
      $cmakePlatform = "win32"
    }

-    msbuild /target:testlight /p:Configuration=Release /p:Platform=$cmakePlatform /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" tyrutils.sln
+    msbuild /target:testlight /p:Configuration=Release /p:Platform=$cmakePlatform /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" ericw-tools.sln

-    msbuild /target:testqbsp /p:Configuration=Release /p:Platform=$cmakePlatform /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" tyrutils.sln
+    msbuild /target:testqbsp /p:Configuration=Release /p:Platform=$cmakePlatform /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" ericw-tools.sln

    msbuild /p:Configuration=Release /p:Platform=$cmakePlatform /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" PACKAGE.vcxproj

--- a/bspinfo/bspinfo.cc
+++ b/bspinfo/bspinfo.cc
@ -28,7 +28,7 @@ main(int argc, char **argv)
    char source[1024];
    int i;

-    printf("---- bspinfo / TyrUtils " stringify(TYRUTILS_VERSION) " ----\n");
+    printf("---- bspinfo / ericw-tools " stringify(ERICWTOOLS_VERSION) " ----\n");
    if (argc == 1) {
        printf("usage: bspinfo bspfile [bspfiles]\n");
        exit(1);
--- a/bsputil/bsputil.cc
+++ b/bsputil/bsputil.cc
@ -455,7 +455,7 @@ main(int argc, char **argv)
    FILE *f;
    int i, err;

-    printf("---- bsputil / TyrUtils " stringify(TYRUTILS_VERSION) " ----\n");
+    printf("---- bsputil / ericw-tools " stringify(ERICWTOOLS_VERSION) " ----\n");
    if (argc == 1) {
        printf("usage: bsputil [--extract-entities] [--extract-textures] [--convert bsp29|bsp2|bsp2rmq|q2bsp] [--check] [--modelinfo]"
               "[--check] bspfile\n");
--- a/build-linux-64.sh
+++ b/build-linux-64.sh
@ -23,6 +23,6 @@ cpack

 # check rpath
 readelf -d ./light/light
-unzip -X tyrutils-*.zip
-readelf -d ./tyrutils-*/bin/light
+unzip -X ericw-tools-*.zip
+readelf -d ./ericw-tools-*/bin/light

--- a/light/light.cc
+++ b/light/light.cc
@ -899,7 +899,7 @@ light_main(int argc, const char **argv)
    const char *lmscaleoverride = NULL;
    
    init_log("light.log");
-    logprint("---- light / TyrUtils " stringify(TYRUTILS_VERSION) " ----\n");
+    logprint("---- light / ericw-tools " stringify(ERICWTOOLS_VERSION) " ----\n");

    LowerProcessPriority();
    numthreads = GetDefaultThreads();
--- a/light/ltface.cc
+++ b/light/ltface.cc
@ -922,7 +922,7 @@ GetLightValueWithAngle(const globalconfig_t &cfg, const light_t *entity, const v
    }
    
    /* Light behind sample point? Zero contribution, period.
-       see: https://github.com/ericwa/tyrutils-ericw/issues/181 */
+       see: https://github.com/ericwa/ericw-tools/issues/181 */
    if (angle < 0) {
        return 0;
    }
@ -2544,7 +2544,7 @@ BoxBlurImage(const std::vector<qvec4f> &input, int w, int h, int radius)
                    // 2017-09-16: this is a hack, but clamping the
                    // x/y instead of discarding the samples outside of the
                    // kernel looks better in some cases:
-                    // https://github.com/ericwa/tyrutils-ericw/issues/171
+                    // https://github.com/ericwa/ericw-tools/issues/171
 #if 0
                    if (x1 < 0 || x1 >= w)
                        continue;
--- a/man/bspinfo.1
+++ b/man/bspinfo.1
@ -28,7 +28,7 @@ http://disenchant.net
 .br

 .SH REPORTING BUGS
-Please post bug reports at https://github.com/ericwa/tyrutils-ericw/issues.
+Please post bug reports at https://github.com/ericwa/ericw-tools/issues.
 .br
 Improvements to the documentation are welcome and encouraged.

--- a/man/bsputil.1
+++ b/man/bsputil.1
@ -38,7 +38,7 @@ http://disenchant.net
 .br

 .SH REPORTING BUGS
-Please post bug reports at https://github.com/ericwa/tyrutils-ericw/issues.
+Please post bug reports at https://github.com/ericwa/ericw-tools/issues.
 .br
 Improvements to the documentation are welcome and encouraged.

--- a/man/light.1
+++ b/man/light.1
@ -437,7 +437,7 @@ Based on source provided by id Software
 http://disenchant.net

 .SH "REPORTING BUGS"
-Please post bug reports at https://github.com/ericwa/tyrutils-ericw/issues.
+Please post bug reports at https://github.com/ericwa/ericw-tools/issues.
 .br
 Improvements to the documentation are welcome and encouraged.

--- a/man/qbsp.1
+++ b/man/qbsp.1
@ -245,7 +245,7 @@ Generates an LMSHIFT bspx lump for use by a light util. Note that both scaled an
 Set to 1 to save mirrored inside faces for bmodels, so when the player view is inside the bmodel, they will still see the faces. (e.g. for func_water, or func_illusionary)

 .SH MAP COMPATIBILITY
-In addition to standard Quake 1 .map files, TyrUtils QBSP is compatible with:
+In addition to standard Quake 1 .map files, ericw-tools QBSP is compatible with:

 .IP \(bu
 Floating point brush coordinates and texture alignments
@ -267,7 +267,7 @@ Based on source provided by id Software and Greg Lewis
 http://disenchant.net

 .SH "REPORTING BUGS"
-Please post bug reports at https://github.com/ericwa/tyrutils-ericw/issues.
+Please post bug reports at https://github.com/ericwa/ericw-tools/issues.
 .br
 Improvements to the documentation are welcome and encouraged.

--- a/qbsp/csg4.cc
+++ b/qbsp/csg4.cc
@ -276,7 +276,7 @@ ClipInside(const face_t *clipface, bool precedence,
        next = face->next;

        /* HACK: Check for on-plane but not the same planenum
-          ( https://github.com/ericwa/tyrutils-ericw/issues/174 )
+          ( https://github.com/ericwa/ericw-tools/issues/174 )
         */
        bool spurious_onplane = false;
        {
--- a/qbsp/parser.cc
+++ b/qbsp/parser.cc
@ -111,7 +111,7 @@ ParseToken(parser_t *p, int flags)
                case 'r':
                case 't':
                case '\\':
-                case 'b': // tyrutils-ericw extension, parsed by light, used to toggle bold text
+                case 'b': // ericw-tools extension, parsed by light, used to toggle bold text
                        //regular two-char escapes
                    *token_p++ = *p->pos++;
                    if (token_p > &p->token[MAXTOKEN - 1])
--- a/qbsp/qbsp.cc
+++ b/qbsp/qbsp.cc
@ -26,7 +26,7 @@
 #include <qbsp/wad.hh>

 static const char *IntroString =
-    "---- qbsp / TyrUtils " stringify(TYRUTILS_VERSION) " ----\n";
+    "---- qbsp / ericw-tools " stringify(ERICWTOOLS_VERSION) " ----\n";

 // command line flags
 options_t options;
--- a/qbsp/surfaces.cc
+++ b/qbsp/surfaces.cc
@ -98,7 +98,7 @@ SubdivideFace(face_t *f, face_t **prevptr)
            v = VectorLength(plane.normal);
            VectorNormalize(plane.normal);
            
-            // ericw -- reverted this, was causing https://github.com/ericwa/tyrutils-ericw/issues/160
+            // ericw -- reverted this, was causing https://github.com/ericwa/ericw-tools/issues/160
 //            if (subdiv > extent/2)      /* if we're near a boundary, just split the difference, this should balance the load slightly */
 //                plane.dist = (mins + subdiv/2) / v;
 //            else
--- a/qbsp/test_qbsp.cc
+++ b/qbsp/test_qbsp.cc
@ -48,7 +48,7 @@ GetTexvecs(const char *map, const char *texname)
    return mapface->get_texvecs();
 }

-// https://github.com/ericwa/tyrutils-ericw/issues/158
+// https://github.com/ericwa/ericw-tools/issues/158
 TEST(qbsp, testTextureIssue) {
    const char *bufActual = R"(
    {
--- a/vis/vis.cc
+++ b/vis/vis.cc
@ -1217,7 +1217,7 @@ main(int argc, char **argv)
    int i;

    init_log("vis.log");
-    logprint("---- vis / TyrUtils " stringify(TYRUTILS_VERSION) " ----\n");
+    logprint("---- vis / ericw-tools " stringify(ERICWTOOLS_VERSION) " ----\n");

    LowerProcessPriority();
    numthreads = GetDefaultThreads();