Skip to content

Commit

Permalink
Preparing for 2.5.7
Browse files Browse the repository at this point in the history
  • Loading branch information
bobbylight committed Jun 24, 2015
1 parent e643382 commit 4605187
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 14 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ distributions {
contents {
from { [ 'build/libs', // The built jar
configurations.runtime, // all runtime dependencies (e.g. rhino)
'../RSyntaxTextArea/build/libs/RSyntaxTextArea-2.5.5.jar',
'../AutoComplete/build/libs/AutoComplete-2.5.4.jar',
'../RSyntaxTextArea/build/libs/RSyntaxTextArea-2.5.7.jar',
'../AutoComplete/build/libs/AutoComplete-2.5.7.jar',
'RSTALanguageSupport.License.txt', 'readme.txt' ] }
rename 'RSyntaxTextArea-.*\\.jar', 'rsyntaxtextarea.jar'
rename 'AutoComplete-.*\\.jar', 'autocomplete.jar'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Note that Maven- and signing-related properties are in <maven-home>/gradle.properties
javaVersion=1.5
version=2.6.0-SNAPSHOT
version=2.5.7
21 changes: 11 additions & 10 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
RSTALanguageSupport Readme
--------------------------
Version 2.5.5
27nov2014
Version 2.5.7
23jun2015

----------------------------------------
Contents
Expand Down Expand Up @@ -32,7 +32,7 @@ project targets Java 5 and beyond.
This library itself relies on the following other libraries (besides
RSyntaxTextArea and AutoComplete):

1. Mozilla Rhino v1.7R4 (http://www.mozilla.org/rhino/)
1. Mozilla Rhino v1.7.6 (http://www.mozilla.org/rhino/)
Used to implement code completion and syntax checking for JavaScript.


Expand Down Expand Up @@ -146,12 +146,13 @@ properly.
org/fife/rsta/ac/sh Code completion fro Unix shell
org/fife/rsta/ac/xml Code completion fro XML
src/main/resources/ Images and resources
src/test/java/ Unit tests
src/test/resources Resources for unit tests
build/ Where gradle generates build artifacts
data/ Input XML for some languages
dist/ Where Ant places the built jar
lib/ Libraries used by this library
rhino/ Rhino, for JS support
test/ (Very) small amount of unit tests
gradle/ Gradle wrapper stuff
build.gradle Gradle build script
gradle.properties Properties for the build.
README.md Markdown readme for Git repository
readme.txt This file
RSTALanguageSupport.License.txt License for this library (modified BSD)
Expand All @@ -167,9 +168,9 @@ the method and parameter descriptions, is welcome.
----------------------------------------
IV. Building the Jar
----------------------------------------
Use Apache Ant (http://ant.apache.org). This project depends on the sister
RSyntaxTextArea and AutoComplete projects. It is recommended that you check
all three projects out side by side. Thus, to build:
This library uses Gradle for builds. It depends on the sister RSyntaxTextArea
and AutoComplete projects. It is recommended that you check out all three
projects out side by side. Thus, to build:

git clone https://github.com/bobbylight/RSyntaxTextArea.git
git clone https://github.com/bobbylight/AutoComplete.git
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/fife/rsta/ac/java/PackageMapNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ public void getClassesInPackage(LibraryInfo info, List<ClassFile> addTo,
name.append('/').append(pkgs[j]);
}
name.append('/');
name.append((String)entry.getKey()).append(".class");
name.append(entry.getKey()).append(".class");
cf = info.createClassFileBulk(name.toString());
map.classFiles.put(entry.getKey(), cf);
possiblyAddTo(addTo, cf, inPkg);
Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/data/php.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9662,6 +9662,13 @@
<param type="int" name="msg_no"/>
</params>
</keyword>
<keyword name="implode" type="function" returnType="string">
<desc><![CDATA[<div class="methodsynopsis dc-description"> <span class="type">string</span> <span class="methodname"><strong>implode</strong></span> ( <span class="methodparam"><span class="type">string</span> <code class="parameter">$glue</code></span> [, <span class="methodparam"><span class="type">string</span> <code class="parameter">$pieces</code></span> ] )</div> <p class="para rdfs-comment"> Join array elements with a string. </desc>
<params>
<param type="string" name="glue"/>
<param type="string" name="pieces"/>
</params>
</keyword>
<keyword name="import_request_variables" type="function" returnType="bool">
<desc><![CDATA[<div class="methodsynopsis dc-description"> <span class="type">bool</span> <span class="methodname"><strong>import_request_variables</strong></span> ( <span class="methodparam"><span class="type">string</span> <code class="parameter">$types</code></span> [, <span class="methodparam"><span class="type">string</span> <code class="parameter">$prefix</code></span> ] )</div> <p class="para rdfs-comment"> Imports GET/POST/Cookie variables into the global scope. It is useful if you disabled <a href="ini.core.php#ini.register-globals" class="link">register_globals</a>, but would like to see some variables in the global scope. </p> <p class="para"> If you&#039;re interested in importing other variables into the global scope, such as <var class="varname"><var class="varname"><a href="reserved.variables.server.php" class="classname">$_SERVER</a></var></var>, consider using <span class="function"><a href="function.extract.php" class="function">extract()</a></span>. </p> <div class="warning"><strong class="warning">Warning</strong><p class="simpara">This function has been<em class="emphasis">DEPRECATED</em> as of PHP 5.3.0 and <em class="emphasis">REMOVED</em> as of PHP 5.4.0.</p></div>]]></desc>
<params>
Expand Down

0 comments on commit 4605187

Please sign in to comment.