Skip to content

Removal of installer #42

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
stariy95 merged 3 commits into from
Sep 12, 2024
Merged

Removal of installer #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b26d9b
Replace custom installer with `jupyter kernelspec install`
m-dzianishchyts Sep 9, 2024
3bbc103
Generalize version
m-dzianishchyts Sep 9, 2024
80387e7
Remove slf4j dependency
m-dzianishchyts Sep 9, 2024
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
213 changes: 0 additions & 213 deletions jjava/assembly/zip/install.py
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions jjava/assembly/zip/kernel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"argv": [
"@PY_EXECUTABLE@",
"@LAUNCHER_PATH@",
"@KERNEL_PATH@",
"java",
"-jar",
"{resource_dir}/launcher-${project.version}.jar",
"{resource_dir}/jjava-${project.version}.jar",
"{connection_file}"
],
"display_name": "Java",
Expand Down
21 changes: 0 additions & 21 deletions jjava/assembly/zip/launcher.py
View file
Open in desktop

This file was deleted.

11 changes: 2 additions & 9 deletions jjava/assembly/zip/zip.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,13 @@
<includeBaseDirectory>false</includeBaseDirectory>
<files>
<file>
<source>${project.build.directory}/${project.build.finalName}.jar</source>
<outputDirectory>java</outputDirectory>
<source>${project.build.directory}/jjava-${project.version}.jar</source>
</file>
<file>
<source>assembly/zip/launcher.py</source>
<outputDirectory>java</outputDirectory>
<source>../launcher/${project.build.directory}/launcher-${project.version}.jar</source>
</file>
<file>
<source>assembly/zip/kernel.json</source>
<outputDirectory>java</outputDirectory>
</file>
<file>
<source>assembly/zip/install.py</source>
<outputDirectory>/</outputDirectory>
<filtered>true</filtered>
</file>
</files>
Expand Down
45 changes: 45 additions & 0 deletions launcher/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>

<parent>
<groupId>org.dflib.jjava</groupId>
<artifactId>jjava-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>

<artifactId>launcher</artifactId>
<name>Java Jupyter Kernel launcher</name>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>org.dflib.jjava.launcher.LauncherMain</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Loading