Skip to content

Move all main classes to org.jruby.main package #9024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
headius merged 7 commits into from
Oct 15, 2025
Merged

Move all main classes to org.jruby.main package #9024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a18a5b
Move all main classes to org.jruby.main package
headius Oct 8, 2025
0419877
Add bin/.jruby.release and use for main class
headius Oct 10, 2025
63ef4cc
Add version from release file to environment output
headius Oct 10, 2025
32621a6
Merge branch 'master' into main_package
headius Oct 10, 2025
9889b05
Source project-owned release file directly to avoid subshell
headius Oct 15, 2025
c702a5d
Remove redundant fetch of JRuby version
headius Oct 15, 2025
38e0355
Eliminate false positive for file-sourced variable
headius Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions antlib/extra.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ build jruby-complete.jar
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-9.0.0.0.jar'/>
<arg value='org.jruby.Main'/>
<arg value='org.jruby.main.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
<arg value='-rminitest/excludes'/>
Expand Down Expand Up @@ -138,7 +138,7 @@ build jruby-complete.jar
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-9.0.0.0.jar'/>
<arg value='org.jruby.Main'/>
<arg value='org.jruby.main.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
<arg value='-rminitest/excludes'/>
Expand All @@ -154,7 +154,7 @@ build jruby-complete.jar
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-9.0.0.0.jar'/>
<arg value='org.jruby.Main'/>
<arg value='org.jruby.main.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
<arg value='-rminitest/excludes'/>
Expand All @@ -170,7 +170,7 @@ build jruby-complete.jar
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-9.0.0.0.jar'/>
<arg value='org.jruby.Main'/>
<arg value='org.jruby.main.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
<arg value='-rminitest/excludes'/>
Expand Down Expand Up @@ -461,7 +461,7 @@ build jruby-complete.jar
<arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
<arg value='-cp'/>
<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-9.0.0.0.jar'/>
<arg value='org.jruby.Main'/>
<arg value='org.jruby.main.Main'/>
<arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
<arg value='-r./test/ruby19_env.rb'/>
<arg value='-rminitest/excludes'/>
Expand Down
2 changes: 2 additions & 0 deletions bin/.jruby.release
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
JRUBY_VERSION=10.0.3.0-SNAPSHOT
JRUBY_MAIN=org.jruby.main.Main
20 changes: 18 additions & 2 deletions bin/jruby.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ echo() {

# ----- Set variable defaults -------------------------------------------------

java_class=org.jruby.Main
JRUBY_SHELL=/bin/sh

# Detect cygwin and mingw environments
Expand Down Expand Up @@ -248,7 +247,7 @@ fi
# Gather environment information as we go
readonly cr='
'
environment_log="JRuby Environment$cr================="
environment_log=""
add_log() {
environment_log="${environment_log}${cr}${*-}"
}
Expand Down Expand Up @@ -436,6 +435,9 @@ readonly pwd_jruby_java_opts_file="$PWD/.jruby.java_opts"
# Options from .dev_mode.java_opts for "--dev" mode, to reduce JRuby startup time
readonly dev_mode_opts_file="$JRUBY_HOME/bin/.dev_mode.java_opts"

# Release file with version-specific values
readonly jruby_release_file="$JRUBY_HOME/bin/.jruby.release"

# ----- Initialize environment log --------------------------------------------

add_log
Expand Down Expand Up @@ -643,6 +645,18 @@ JAVA_OPTS="$JAVA_OPTS_TEMP"

CP_DELIMITER=":"

# Get main class and version from .jruby.release

# shellcheck source=/dev/null
# shellcheck disable=2153 # Assigned in sourced file
if [ -f "$jruby_release_file" ] && . "$jruby_release_file"; then
java_class=$JRUBY_MAIN
jruby_version=$JRUBY_VERSION
else
java_class=org.jruby.main
jruby_version=unspecified
fi

# Find main jruby jar and add it to the classpath
jruby_jar=
for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.jar; do
Expand Down Expand Up @@ -997,7 +1011,9 @@ add_log
add_log "Java command line:"
add_log " $*"

# shellcheck source=/dev/null
if $print_environment_log; then
environment_log="JRuby Environment${cr}=================${cr}${cr}JRuby version: ${jruby_version}${environment_log}"
echo "$environment_log"
exit 0
fi
Expand Down
25 changes: 3 additions & 22 deletions core/src/main/java/org/jruby/JarBootstrapMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,12 @@
package org.jruby;

/**
* A specialized "main" entry point that assumes it will run a specific file
* (jar-bootstrap.rb) when launching. This allows modifying only the manifest's
* Main-Class and adding this file to create a self-contained executable JRuby
* application.
*
* Example usage:
*
* <pre>
* ~/projects/jruby $ cp lib/jruby.jar myapp.jar
*
* ~/projects/jruby $ cat jar-bootstrap.rb
* puts "hello"
*
* ~/projects/jruby $ jar ufe myapp.jar org.jruby.JarBootstrapMain jar-bootstrap.rb
*
* ~/projects/jruby $ java -jar myapp.jar
* hello
* </pre>
* @deprecated Use {@link org.jruby.main.JarBootstrapMain} instead.
*/
@Deprecated(since = "10.0.3.0", forRemoval = true)
public class JarBootstrapMain {
public static final String JAR_BOOTSTRAP = "classpath:/jar-bootstrap.rb";
public static void main(String[] args) {
String[] newArgs = new String[args.length + 1];
newArgs[0] = JAR_BOOTSTRAP;
System.arraycopy(args, 0, newArgs, 1, args.length);
Main.main(newArgs);
org.jruby.main.JarBootstrapMain.main(args);
}
}
Loading
Loading