Rename assembly -> graphicsfuzz (#125)

Author: paulthomson

run-configurations/Build.xml .idea/runConfigurations/Build.xml

@@ -36,7 +36,7 @@ def call(args):
 def go():
 	os.chdir(os.environ["OGLT_SOURCE_ROOT"])
         os.environ["MAVEN_OPTS"] = os.environ.get("MAVEN_OPTS", "") + " -XX:+TieredCompilation -XX:TieredStopAtLevel=1 "
-	call(["mvn", "-Dmaven.test.skip=true", "-am", "-pl", "assembly", "package"])
+	call(["mvn", "-Dmaven.test.skip=true", "-am", "-pl", "graphicsfuzz", "package"])
 
 if __name__ == "__main__":
 	go()

run-configurations/Build__run_tests_.xml .idea/runConfigurations/Build__run_tests_.xml

@@ -36,7 +36,7 @@ def call(args):
 def go():
 	os.chdir(os.environ["OGLT_SOURCE_ROOT"])
         os.environ["MAVEN_OPTS"] = os.environ.get("MAVEN_OPTS", "") + " -XX:+TieredCompilation -XX:TieredStopAtLevel=1 "
-	call(["mvn", "-Dmaven.test.skip=true", "-am", "-pl", "assembly", "clean"])
+	call(["mvn", "-Dmaven.test.skip=true", "-am", "-pl", "graphicsfuzz", "clean"])
 
 if __name__ == "__main__":
 	go()

run-configurations/Build__run_tests___image_tests_.xml .idea/runConfigurations/Build__run_tests___image_tests_.xml

@@ -37,7 +37,7 @@ def go():
 	os.chdir(os.environ["OGLT_SOURCE_ROOT"])
 	os.environ["MAVEN_OPTS"] = os.environ.get("MAVEN_OPTS", "") + " -XX:+TieredCompilation -XX:TieredStopAtLevel=1 "
 	if len(sys.argv[1:]) == 0:
-	        print("Try: \nm -pl assembly package\nm -pl assembly package -P shade,zip")
+	        print("Try: \nm -pl graphicsfuzz package")
 	        return
 	call(["mvn", "-Dmaven.test.skip=true", "-am"] + sys.argv[1:])
 

run-configurations/Clean.xml .idea/runConfigurations/Clean.xml

@@ -25,7 +25,7 @@ RUN \
 
 COPY \
   build/docker/scripts/build.sh \
-  assembly/src/main/scripts/docker/scripts/umask-wrapper.sh \
+  graphicsfuzz/src/main/scripts/docker/scripts/umask-wrapper.sh \
   /data/
 
 WORKDIR /data

run-configurations/Remote_debug_localhost.xml .idea/runConfigurations/Remote_debug_localhost.xml

@@ -75,12 +75,12 @@ def go():
 
     shutil.copy2(
         "OPEN_SOURCE_LICENSES.TXT",
-        path("assembly", "src", "main", "scripts", "OPEN_SOURCE_LICENSES.TXT")
+        path("graphicsfuzz", "src", "main", "scripts", "OPEN_SOURCE_LICENSES.TXT")
     )
 
     shutil.copy2(
         "LICENSE",
-        path("assembly", "src", "main", "scripts", "LICENSE.TXT")
+        path("graphicsfuzz", "src", "main", "scripts", "LICENSE.TXT")
     )
 
     # Rebuild with tests.
@@ -89,8 +89,8 @@ def go():
 
     # Copy output.
     shutil.copy2(
-        path("assembly", "target", "assembly-1.0.zip"),
-        path("out", "server.zip")
+        path("graphicsfuzz", "target", "graphicsfuzz-1.0.zip"),
+        path("out", "graphicsfuzz-1.0.zip")
     )
 
     source_root = os.path.abspath(".")

run-configurations/Run_server.xml .idea/runConfigurations/Run_server.xml

@@ -75,7 +75,7 @@ def exclude_filepath(f: str):
     return \
         f.startswith("./python/src/main/python/drivers/") and is_command_wrapper(f) or \
         f in [
-            "./assembly/src/main/scripts/server-static/shaders/shader.vert",
+            "./graphicsfuzz/src/main/scripts/server-static/shaders/shader.vert",
             "./server-static-public/src/main/files/server-static/runner_multi_template.html",
             "./platforms/libgdx/OGLTesting/build.gradle",
             "./platforms/libgdx/OGLTesting/gradle.properties",

build/commands/build

@@ -888,7 +888,7 @@ def write_license_from_url(fout: typing.TextIO, url: str) -> None:
 
 def go():
     maven_dependencies: typing.Dict[str, typing.Dict] = dict()
-    read_maven_dependencies(maven_dependencies, path("assembly", "target", "dependencies.txt"))
+    read_maven_dependencies(maven_dependencies, path("graphicsfuzz", "target", "dependencies.txt"))
     dependencies_populated = get_maven_dependencies_populated()
     dependencies_populated.update(get_extras())
 

build/commands/clean

@@ -18,8 +18,8 @@ limitations under the License.
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>assembly</artifactId>
-  <name>assembly</name>
+  <artifactId>graphicsfuzz</artifactId>
+  <name>graphicsfuzz</name>
   <packaging>pom</packaging>
 
   <parent>

build/commands/m

@@ -240,11 +240,6 @@ limitations under the License.
         <artifactId>android-client-dep</artifactId>
         <version>1.0</version>
       </dependency>
-      <dependency>
-        <groupId>com.graphicsfuzz</groupId>
-        <artifactId>assembly</artifactId>
-        <version>1.0</version>
-      </dependency>
       <dependency>
         <groupId>com.graphicsfuzz</groupId>
         <artifactId>assembly-binaries</artifactId>
@@ -316,6 +311,11 @@ limitations under the License.
         <artifactId>generator</artifactId>
         <version>1.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.graphicsfuzz</groupId>
+        <artifactId>graphicsfuzz</artifactId>
+        <version>1.0</version>
+      </dependency>
       <dependency>
         <groupId>com.graphicsfuzz</groupId>
         <artifactId>parent-checkstyle</artifactId>

build/docker/dockerfiles/DockerfileBuild

@@ -17,7 +17,7 @@ limitations under the License.
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.graphicsfuzz</groupId>
-  <artifactId>GraphicsFuzz</artifactId>
+  <artifactId>graphicsfuzz-root</artifactId>
   <version>1.0</version>
   <packaging>pom</packaging>
 
@@ -31,7 +31,6 @@ limitations under the License.
     <module>android-client-dep</module>
     <module>assembly-binaries</module>
     <module>assembly-public</module>
-    <module>assembly</module>
     <module>ast</module>
     <module>checkstyle-config</module>
     <module>client-tests</module>
@@ -40,6 +39,7 @@ limitations under the License.
     <module>fuzzerserver</module>
     <module>generate-and-run-shaders</module>
     <module>generator</module>
+    <module>graphicsfuzz</module>
     <module>parent-all</module>
     <module>parent-checkstyle</module>
     <module>python</module>

build/travis/build.py

@@ -96,9 +96,9 @@ public static String getInstallDirectory() {
     if (isRunningFromIde(jarDir)) {
       return Paths.get(
           getSourceRoot(jarDir),
-          "assembly",
+          "graphicsfuzz",
           "target",
-          "assembly-1.0").toString();
+          "graphicsfuzz-1.0").toString();
     }
 
     return jarDir.getParentFile().toString();