Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into dtrace
Browse files Browse the repository at this point in the history
headius committed Jan 23, 2014
2 parents aa7bc2f + 2a1a35f commit e2934f1
Showing 5,188 changed files with 17,692 additions and 252,712 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ env:
- TARGET='spec:ci_interpreted_travis'
- TARGET='spec:ci_interpreted_ir_travis'
- TARGET='spec:ir'
- TARGET='spec:truffle'
- TARGET='test-dist'

matrix:
34 changes: 26 additions & 8 deletions BUILDING.md
Original file line number Diff line number Diff line change
@@ -179,14 +179,6 @@ mvn -Pjruby-jars

the gem will be in ./maven/jruby-jars/target

### gems - excluding jruby jars gem###

```
mvn -Pgems
```

the gem will be in ./maven/gems/*/pkg

### building ALL packages ###

```
@@ -210,3 +202,29 @@ mvn clean deploy -Psonatype-oss-release -Prelease
```

go to oss.sonatype.org and close the deployment which will check if all 'required' files are in place and then finally push the release to maven central and . . .

# RUBY-MAVEN #

install/update the gem with (MRI or jruby) - needs version 3.1.1.0.2 or newer

```
gem install ruby-maven
```

for the embedded ruby script ruby-maven uses jruby 1.7.10 with MRI or the jruby version launching rmvn

```
rmvn clean install
```

regular maven uses the the jruby from the installion, i.e. 9000.dev. this also means that a regular maven run does not depend under the hood on any other jruby versions from maven central.

ruby-maven is just maven with a ruby DSL and it is a stripped version of [tesla-polyglot-cli](https://github.com/tesla/tesla-polyglot) which comes with further DSL like yaml, scala, groovy, etc

running rmvn or tesla-poluglot-cli will generate the pom.xml from pom.rb or Mavenfile (with the accompanied gemspec file).

changes on the scripts in **pom.rb** or **Mavenfile** will work directly with regular maven. any changes with the actual pom DSL needs to be translated to opm.xml via

```
rmvn validate -Pall
```
241 changes: 0 additions & 241 deletions Mavenfile

This file was deleted.

18 changes: 18 additions & 0 deletions antlib/spec.xml
Original file line number Diff line number Diff line change
@@ -77,6 +77,24 @@
<rake task="spec:ir"/>
</target>

<!-- Doesn't use the same spec infrastructure as the rest of the system at
the moment as Truffle is still a bit too tender for that.-->
<target name="spec:truffle" depends="bootstrap">
<exec executable="bin/jruby" failonerror="true">
<arg value="-X+T"/>
<arg value="spec/mspec/bin/mspec"/>
<arg value="run"/>
<arg value="-t"/>
<arg value="bin/jruby"/>
<arg value="-T"/>
<arg value="-X+T"/>
<arg value="--config"/>
<arg value="spec/truffle/truffle.mspec"/>
<arg value="--excl-tag"/>
<arg value="fails"/>
</exec>
</target>

<!-- Old compatibility targets which call to newer Rake-based ones -->
<target name="spec" depends="spec:ci_18"/>
<target name="spec-ci" depends="spec:ci_18"/>
6 changes: 0 additions & 6 deletions bin/gem.bat

This file was deleted.

6 changes: 0 additions & 6 deletions bin/irb.bat

This file was deleted.

6 changes: 0 additions & 6 deletions bin/jirb.bat

This file was deleted.

6 changes: 0 additions & 6 deletions bin/jirb_swing.bat

This file was deleted.

6 changes: 0 additions & 6 deletions bin/rdoc.bat

This file was deleted.

6 changes: 0 additions & 6 deletions bin/ri.bat

This file was deleted.

2 changes: 1 addition & 1 deletion core/.classpath
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
6 changes: 3 additions & 3 deletions core/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=1.7
Loading

0 comments on commit e2934f1

Please sign in to comment.