mirror of
https://github.com/2006-Scape/Parabot.git
synced 2026-07-03 00:37:55 +00:00
Merge branch 'development' into bugfix/automatic-building
This commit is contained in:
@@ -2,8 +2,6 @@
|
||||
|
||||
if [ "$TRAVIS_BRANCH" == "master" ]; then
|
||||
mvn -U package
|
||||
mkdir -p $TRAVIS_BUILD_DIR/target/apidocs/zips/
|
||||
zip -r $TRAVIS_BUILD_DIR/target/apidocs/zips/$PARABOT_VERSION.zip $TRAVIS_BUILD_DIR/target/apidocs/$PARABOT_VERSION
|
||||
else
|
||||
mvn -Dbuild.version="-RC-$TRAVIS_BUILD_ID" -U package
|
||||
fi
|
||||
@@ -0,0 +1,3 @@
|
||||
#! /bin/bash
|
||||
|
||||
mvn install source:jar javadoc:jar deploy site-deploy
|
||||
@@ -13,6 +13,7 @@
|
||||
<properties>
|
||||
<jdk.version>1.7</jdk.version>
|
||||
<build.version></build.version>
|
||||
<additionalparam>-Xdoclint:none</additionalparam>
|
||||
</properties>
|
||||
|
||||
<name>Parabot client</name>
|
||||
@@ -104,12 +105,14 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>2.10.4</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-javadocs</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
<phase>deploy</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
@@ -117,9 +120,23 @@
|
||||
<failOnError>false</failOnError>
|
||||
<quiet>true</quiet>
|
||||
<outputDirectory>${project.build.directory}/apidocs/${project.version}</outputDirectory>
|
||||
<additionalparam>-Xdoclint:none</additionalparam>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<artifactId>maven-site-plugin</artifactId>
|
||||
<version>3.5.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-descriptor</id>
|
||||
<goals>
|
||||
<goal>attach-descriptor</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
@@ -140,7 +157,6 @@
|
||||
<executions>
|
||||
<execution>
|
||||
<id>make-assembly</id>
|
||||
<!-- bind to the packaging phase -->
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
@@ -149,5 +165,38 @@
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
||||
<extensions>
|
||||
<extension>
|
||||
<groupId>org.apache.maven.wagon</groupId>
|
||||
<artifactId>wagon-ftp</artifactId>
|
||||
<version>2.10</version>
|
||||
</extension>
|
||||
</extensions>
|
||||
</build>
|
||||
|
||||
<distributionManagement>
|
||||
<downloadUrl>https://maven.parabot.org/</downloadUrl>
|
||||
<repository>
|
||||
<uniqueVersion>false</uniqueVersion>
|
||||
<id>parabot-maven</id>
|
||||
<name>Custom Maven Repository</name>
|
||||
<url>ftp://maven.parabot.org</url>
|
||||
<layout>default</layout>
|
||||
</repository>
|
||||
<site>
|
||||
<id>parabot-maven</id>
|
||||
<name>Frontend Parabot Maven</name>
|
||||
<url>ftp://maven.parabot.org/docs/${artifactId}/</url>
|
||||
</site>
|
||||
</distributionManagement>
|
||||
|
||||
<reporting>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</reporting>
|
||||
</project>
|
||||
@@ -27,7 +27,7 @@ public class Getter implements Injectable {
|
||||
*
|
||||
* @param into - classnode to inject getter method in
|
||||
* @param fieldLocation - classnode where field is located
|
||||
* @param fieldName - field name to get
|
||||
* @param fieldNode - field name to get
|
||||
* @param methodName - method name of getter
|
||||
* @param returnDesc - return type of method, can be null for default return
|
||||
* @param staticMethod - pass true if you want the method to be static
|
||||
|
||||
@@ -32,7 +32,6 @@ import org.parabot.core.io.SizeInputStream;
|
||||
import org.parabot.core.ui.components.VerboseLoader;
|
||||
|
||||
/**
|
||||
*
|
||||
* Manages, parses and dumps class files & jars
|
||||
*
|
||||
* @author Everel
|
||||
@@ -83,7 +82,7 @@ public class ClassPath {
|
||||
/**
|
||||
* Adds a jar to this classpath
|
||||
*
|
||||
* @param url
|
||||
* @param connection
|
||||
*/
|
||||
public void addJar(final URLConnection connection) {
|
||||
try {
|
||||
@@ -148,7 +147,7 @@ public class ClassPath {
|
||||
/**
|
||||
* Finds and loads all classes/jar files in folder
|
||||
*
|
||||
* @param file
|
||||
* @param f
|
||||
* to find class / jar files
|
||||
* @param root
|
||||
*/
|
||||
@@ -191,10 +190,10 @@ public class ClassPath {
|
||||
|
||||
/**
|
||||
* Loads class from input stream
|
||||
*
|
||||
* @param inputstream
|
||||
*
|
||||
* @param in
|
||||
* @throws IOException
|
||||
*/
|
||||
*/
|
||||
protected void loadClass(InputStream in) throws IOException {
|
||||
ClassReader cr = new ClassReader(in);
|
||||
ClassNode cn = new ClassNode();
|
||||
|
||||
@@ -15,11 +15,11 @@ public abstract class AbstractDebugger implements Paintable {
|
||||
* Toggles this debugger
|
||||
*/
|
||||
public abstract void toggle();
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @return <b>true</b> if this debugger is enabled, otherwise <b>false</b>
|
||||
*/
|
||||
*
|
||||
* @return True if this debugger is enabled, otherwise false
|
||||
*/
|
||||
public abstract boolean isEnabled();
|
||||
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ public class Timer {
|
||||
/**
|
||||
* Timer Constructor
|
||||
*
|
||||
* @param start
|
||||
* @param end
|
||||
*/
|
||||
public Timer(long end) {
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user