Skip to content

Commit

Permalink
Get most 'project-athena' -> 'vircadia' references.
Browse files Browse the repository at this point in the history
  • Loading branch information
digisomni committed Dec 13, 2020
1 parent a3dfa6a commit 16eca5d
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ jobs:
- name: Build for Android + Quest
if: matrix.build_type == 'android'
shell: bash
working-directory: ${{runner.workspace}}/project-athena
working-directory: ${{runner.workspace}}/vircadia
run: |
echo "Pre-cache the vcpkg managed dependencies"
$PYTHON_EXEC prebuild.py --build-root ${{runner.workspace}}/build --android interface
Expand Down
2 changes: 1 addition & 1 deletion BUILD_LINUX.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ sudo apt-get install nodejs

Clone this repository:
```bash
git clone https://github.com/vircadia/project-athena.git
git clone https://github.com/vircadia/vircadia.git
```

To compile a DEV version checkout the branch you need. To get a list of all tags:
Expand Down
2 changes: 1 addition & 1 deletion BUILD_WIN.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Note: You can also run Interface by launching it from command line or File Explo
For any problems after Step #6, first try this:
* Delete your locally cloned copy of the Vircadia repository
* Restart your computer
* Redownload the [repository](https://github.com/vircadia/project-athena)
* Redownload the [repository](https://github.com/vircadia/vircadia)
* Restart directions from Step #6

#### CMake gives you the same error message repeatedly after the build fails
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Contributing
6. Update your branch

```
git remote add upstream https://github.com/vircadia/project-athena
git remote add upstream https://github.com/vircadia/vircadia
git pull upstream master
```

Expand All @@ -38,10 +38,10 @@ Contributing
Reporting Bugs
===
1. Always update to the latest code on master, we make many merges every day and it is possible the bug has already been fixed!
2. Search [issues](https://github.com/vircadia/project-athena/issues) to make sure that somebody has not already reported the same bug.
3. [Add](https://github.com/vircadia/project-athena/issues/new) your report to the issues list!
2. Search [issues](https://github.com/vircadia/vircadia/issues) to make sure that somebody has not already reported the same bug.
3. [Add](https://github.com/vircadia/vircadia/issues/new) your report to the issues list!

Requesting a Feature
===
1. Search [issues](https://github.com/vircadia/project-athena/issues) to make sure that somebody has not already requested the same feature.
2. [Add](https://github.com/vircadia/project-athena/issues/new) your request to the issues list!
1. Search [issues](https://github.com/vircadia/vircadia/issues) to make sure that somebody has not already requested the same feature.
2. [Add](https://github.com/vircadia/vircadia/issues/new) your request to the issues list!
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ Vircadia is a 3D social software project seeking to incrementally bring about a

### Releases

[View Releases here](https://github.com/vircadia/project-athena/releases/)
[View Releases here](https://github.com/vircadia/vircadia/releases/)

### How to build the Interface

[For Windows](https://github.com/vircadia/project-athena/blob/master/BUILD_WIN.md)
[For Windows](https://github.com/vircadia/vircadia/blob/master/BUILD_WIN.md)

[For Mac](https://github.com/vircadia/project-athena/blob/master/BUILD_OSX.md)
[For Mac](https://github.com/vircadia/vircadia/blob/master/BUILD_OSX.md)

[For Linux](https://github.com/vircadia/project-athena/blob/master/BUILD_LINUX.md)
[For Linux](https://github.com/vircadia/vircadia/blob/master/BUILD_LINUX.md)

[For Linux - Vircadia Builder](https://github.com/vircadia/vircadia-builder)

Expand All @@ -30,7 +30,7 @@ Vircadia is a 3D social software project seeking to incrementally bring about a

### How to generate an Installer

[For Windows](https://github.com/vircadia/project-athena/blob/master/INSTALL.md)
[For Windows](https://github.com/vircadia/vircadia/blob/master/INSTALL.md)

[For Linux - AppImage - Vircadia Builder](https://github.com/vircadia/vircadia-builder/blob/master/README.md#building-appimages)

Expand Down
8 changes: 4 additions & 4 deletions android/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,17 @@ RUN mkdir "$HIFI_BASE" && \
mkdir "$HIFI_ANDROID_PRECOMPILED"

# Download the repo
RUN git clone https://github.com/vircadia/project-athena.git
RUN git clone https://github.com/vircadia/vircadia.git

WORKDIR /home/gha/project-athena
WORKDIR /home/gha/vircadia

RUN mkdir build

# Pre-cache the vcpkg managed dependencies
WORKDIR /home/gha/project-athena/build
WORKDIR /home/gha/vircadia/build
RUN python3 ../prebuild.py --build-root `pwd` --android interface

# Pre-cache the gradle dependencies
WORKDIR /home/gha/project-athena/android
WORKDIR /home/gha/vircadia/android
RUN ./gradlew -m tasks -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED
#RUN ./gradlew extractDependencies -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED
2 changes: 1 addition & 1 deletion domain-server/resources/web/assignment/placeholder.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Here you can put a script that will be run by an assignment-client (AC)
// For examples, please go to https://github.com/vircadia/project-athena/tree/master/script-archive/acScripts
// For examples, please go to https://github.com/vircadia/vircadia/tree/master/script-archive/acScripts
// The directory named acScripts contains assignment-client specific scripts you can try.
2 changes: 1 addition & 1 deletion hifi_qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def __init__(self, args):
else:
print("Sorry, " + distro.name(pretty=True) + " is not supported. Please consider helping us out.")
print("It's also possible to build Qt for your distribution, please see the documentation at:")
print("https://github.com/vircadia/project-athena/tree/master/tools/qt-builder")
print("https://github.com/vircadia/vircadia/tree/master/tools/qt-builder")
raise Exception('UNKNOWN LINUX VERSION!!!')
else:
print("System : " + platform.system())
Expand Down
2 changes: 1 addition & 1 deletion libraries/networking/src/NetworkingConstants.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ namespace NetworkingConstants {
const QUrl HELP_FORUM_URL { "https://forums.vircadia.dev" };
const QUrl HELP_SCRIPTING_REFERENCE_URL{ "https://apidocs.vircadia.dev/" };
const QUrl HELP_RELEASE_NOTES_URL{ "https://docs.vircadia.dev/release-notes.html" };
const QUrl HELP_BUG_REPORT_URL{ "https://github.com/vircadia/project-athena/issues" };
const QUrl HELP_BUG_REPORT_URL{ "https://github.com/vircadia/vircadia/issues" };

const QString DEFAULT_VIRCADIA_ADDRESS = "file:///~/serverless/tutorial.json";
const QString DEFAULT_HOME_ADDRESS = "file:///~/serverless/tutorial.json";
Expand Down
4 changes: 2 additions & 2 deletions pkg-scripts/server-control
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Maintainer: Heather Anderson <[email protected]>
Build-Depends: debhelper (>= 10)
Standards-Version: 4.1.2
Homepage: https://vircadia.com
Vcs-Git: https://github.com/vircadia/project-athena.git
Vcs-Browser: https://github.com/vircadia/project-athena
Vcs-Git: https://github.com/vircadia/vircadia.git
Vcs-Browser: https://github.com/vircadia/vircadia

Package: vircadia-server
Architecture: any
Expand Down
2 changes: 1 addition & 1 deletion prebuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def parse_args():
if True:
args = parser.parse_args()
else:
args = parser.parse_args(['--android', 'questInterface', '--build-root', 'C:/git/project-athena/android/apps/questInterface/.externalNativeBuild/cmake/debug/arm64-v8a'])
args = parser.parse_args(['--android', 'questInterface', '--build-root', 'C:/git/vircadia/android/apps/questInterface/.externalNativeBuild/cmake/debug/arm64-v8a'])
return args

def main():
Expand Down
2 changes: 1 addition & 1 deletion scripts/system/more/more.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Copyright 2020 Vircadia contributors.
//
// App maintained in: https://github.com/vircadia/community-apps
// App copied to: https://github.com/vircadia/project-athena
// App copied to: https://github.com/vircadia/vircadia
//
//
// Distributed under the Apache License, Version 2.0.
Expand Down
2 changes: 1 addition & 1 deletion server-console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/vircadia/project-athena.git"
"url": "https://github.com/vircadia/vircadia.git"
},
"main": "src/main.js",
"scripts": {
Expand Down

0 comments on commit 16eca5d

Please sign in to comment.