MavenToPKGBUILD 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16b553b7dde81a9312b17aa8f48f8f0020758cab2752322cec52a8ff8cab9f11
-  data.tar.gz: 49d513d07af90fcbe771be266bdb4cbb843573ff502b8133563c82dfd33875be
+  metadata.gz: e281763f595a3dab52f40f3763200a8be8acafc3a612e4aebd956b044467bd86
+  data.tar.gz: 7a026710db4d7cf4b518c20d4647d84cc560c60488bdccf0a65068dcc395e720
 SHA512:
-  metadata.gz: 4eadb3d7b5b23d291e5899ff49eab96799201d5df1414c1448a201c62ff8549ab4e491ac662f0b7c0dafe00788407570a104f606eae674286e77192e9f92cbe0
-  data.tar.gz: fbb99ad22d278bedb5415961eb7e37fb1816020f2a4c644901381def469a2605785bce6cf8642e039f0969ddac15c086ded185429d1bb4f23750747e9d4e2447
+  metadata.gz: 78ef0535178e5c54bc80a83ae4b185980111f2ae3ae58e9542a56588a8a665648de269f948e99ed7f6d0e43a3a0011b75263123b1ee24555b4f744435311ce76
+  data.tar.gz: 446978698cb38aa78f2f73dfda2c1165a08b1962e889f01ad734397c397a60f6f93b775948651e6763b3f94f6b2ff53c80d237f3c6b36eb4da26222243cf6a4f

data/README.md

@@ -81,6 +81,8 @@ java -cp $CP:target/* tech.lity.rea.nectar.camera.Test
 
 ### TODO: 
 
-* Gemify this. 
+* ~Gemify this~.
+* ~Deploy Gem~.
+* Update README.
+* More tests. 
 * Better parsing. 
-* Large scale tests.

data/exe/pkg-maven

@@ -1,13 +1,16 @@
 #!/usr/bin/env ruby
-
 require 'optparse'
-
 require 'MavenToPKGBUILD'
 
+include MavenToPKGBUILD
+
 options = {}
 op = OptionParser.new do |opts|
-  opts.banner = "Usage: pkg-maven file.yaml [name/all] [options]"
-
+  opts.banner = <<-USAGE
+Usage: pkg-maven file.yaml [name/all] [options]
+or   : pkg-maven artifactId groupId version [options]
+USAGE
+  
   opts.on("-f", "--full", "Fetch all dependencies") do |v|
     options[:full] = v
   end
@@ -31,34 +34,26 @@ op = OptionParser.new do |opts|
 end
 op.parse!
 
-if(ARGV.size <= 1)
-  puts op
-  exit
-end
-
-# p options
-# p ARGV
+def error;  puts op ; exit ; end
+def yaml?(s); s.end_with? 'yaml' or s.end_with? 'yml' ; end
 
-include MavenToPKGBUILD
 
+error if ARGV.size <= 1
 
-if(ARGV[0].end_with? '.yaml' or ARGV[0].end_with? ".yml")
+if yaml?(ARGV[0])
   files = YAML.load_file ARGV[0]
 
-  arch = ARGV[2] unless  ARGV[2].nil?
-  
   # case 1: build all.
   if(ARGV[1].eql? "all")
 
     ## Filter the non-platform deps from javacpp-presets
-
     without_platform = files.map do |dep|
       next if files.has_key?(dep[0]+"-platform")
       dep[1]
     end.compact!
     ## reject the empty ones created by next
     
-    without_platform.each{ |pkg| puts "BUILD" + pkg.to_s ; build_pkg(pkg, options) }
+    without_platform.each{ |pkg|  build_pkg(pkg, options) }
     return
   end
   
@@ -68,7 +63,6 @@ if(ARGV[0].end_with? '.yaml' or ARGV[0].end_with? ".yml")
     build_pkg(pkg, options)
     return
   end
-
   return
 end
   
@@ -78,14 +72,9 @@ if(ARGV.size < 3)
   return
 end
 
-name = ARGV[0]         # redis
+artifactId = ARGV[0]         # redis
 groupid = ARGV[1]      # redis.clients
 version = ARGV[2]      # 2.9.0
-artifactid = name  
-
-arch = ARGV[3] unless  ARGV[3].nil?
-
-#artifactid = ARGV[3] if ARGV.size > 3 # jedis
+name = artifactId
 
-# build it !
 build(name, groupid, version, artifactid, options)

data/exe/pkg-maven-list-deps

@@ -1,23 +1,52 @@
 #!/usr/bin/env ruby
-
 require 'yaml'
+require 'optparse'
 require 'MavenToPKGBUILD'
 
 include MavenToPKGBUILD
 
-if ARGV[0] != nil
-  output = ARGV[0]
-else
-  output = "deps.yaml"
+
+output = "deps.yaml"
+classpath_name = "classpath.txt"
+
+options = {}
+op = OptionParser.new do |opts|
+  opts.banner = <<-USAGE
+Usage: pkg-maven-list-deps [output.yaml]  # a pom.xml file is required in the folder.
+USAGE
+  
+  # opts.on("-c", "--classpath", "Create a classpath output file.") do |v|
+  #   options[:classpath] = v
+  # end
+
+  opts.on("-oFILE", "--output=FILE", "Output file name. #{output} by default.") do |n|
+    options[:output] = n
+  end
+
+  opts.on("-aARCH", "--arch=ARCH", "Selected architure, x86_64 by default.") do |n|
+    options[:arch] = n
+  end
+
+  opts.on("-vVERSION", "--version=VERSION", "Minor version, default is 1.") do |n|
+    options[:version] = n
+  end
+
+  opts.on("-h", "--help", "Prints this help") do
+    puts opts
+    exit
+  end
 end
+op.parse!
+
+output = ARGV[0] if ARGV[0] != nil
 
 # platforms = ["linux", "windows", "macosx"]
 # archs = ["x86_64", "x86", "arm"]
 
 platform="linux"
-arch="x86_64"
-
+arch= options.fetch(:arch, "x86_64")
 tmp = "tmp.txt"
+
 `mvn dependency:list -Djavacpp.platform=#{platform}-#{arch} -DoutputFile=#{tmp}`
 
 lines = File.readlines tmp
@@ -42,18 +71,18 @@ lines.each do |l|
 end 
 
 
-# TODO: Ignore completely ?!!
+# TODO: Ignore it also before ?
+# Remove an element if there is one with the -platform also.
+# For Javacpp-presets.
 without_platform = all_deps.map do |dep|
   next if all_deps.has_key?(dep[0]+"-platform")
   dep[1]
 end.compact!
-## reject the empty ones created by next
+## compact rejects the empty ones created by next
 
 without_platform.each do |dep|
-  ## jar name 
   v = create_pkg_version(dep["version"])
   n = dep["artifactid"]
-
   dep_file =  prefix + n + "-" + v + ".jar"
 
   if File.exist?(dep_file)
@@ -68,5 +97,5 @@ end
 
 
 File.open(output, 'w') {|f| f.write all_deps.to_yaml }
-File.open("classpath.txt", 'w') {|f| f.write all_deps_jar }
+File.open(classpath_name, 'w') {|f| f.write all_deps_jar }
 

data/lib/MavenToPKGBUILD.rb

@@ -5,7 +5,7 @@ require "MavenToPKGBUILD/version"
 module MavenToPKGBUILD
 
   def create_pkg_version(version)
-    version.delete_prefix("'").delete_suffix("'").split("-").first
+    version.to_s.delete_prefix("'").delete_suffix("'").split("-").first
   end
   
   def build_pkg(pkg, options)
@@ -14,131 +14,149 @@ module MavenToPKGBUILD
 
   def build(name, groupid, version, artifactid, options) # arch="x86_64", full=false, compact=false)
 
-    name = artifactid if  name.nil?
+    ## Arguments, Pom variables
+    @artifactid = artifactid
+    @version = version
+    @groupid = groupid
+    @name = artifactid if name.nil?
+    @foldername = @name
 
-    arch = "x86_64"
-    arch = options[:arch] unless options[:arch].nil? 
-    
-    full = false
-    full = options[:full] unless options[:full].nil?
-    
-    compact = false
-    compact = options[:compact] unless options[:compact].nil?
-
-    pkgrel = "1"
-    pkgrel = options[:version] unless options[:version].nil?
-    
-    puts "Starting to build #{name}, #{groupid}, #{version}, #{artifactid}. "
-    
-    javacpp = false
+    ## Options
+    @arch = options.fetch :arch, "x86_64"
+    @full = options.fetch :full, false
+    @compact = options.fetch :compact, false
 
+    ## PKGBUILD variables
     ## Sometimes there are quotes in version names.
-    pkgversion = version.delete_prefix("'").delete_suffix("'")
-
-    javacppversion = ""
-    compact_pkg = ""
-    compact_pkg = "-compact" if compact
+    @pkgversion = @version.to_s.delete_prefix("'").delete_suffix("'")
+    @pkgarch = "any" 
+    @pkgrel = options.fetch :version, "1"
+    @compact_pkg = @compact ? "-compact" : ""
 
-    platform = "linux"
-    foldername = name
+    
+    ## JavaCPP variables
+    @javacppversion = ""
+    @platform = "linux"
+    @javacpp = false
 
-    pkgarch = "any" 
+    puts "Starting to build #{@name}, #{@groupid}, #{@version}, #{@artifactid}. "
     
-    if(groupid.eql? "org.bytedeco.javacpp-presets" and artifactid.end_with? "-platform")
+    if(@groupid.eql? "org.bytedeco.javacpp-presets" and @artifactid.end_with? "-platform")
       puts "JavaCPP platform building"
-      javacpp = true
-      name = artifactid.split("-platform").first
-      pkgversion, javacppversion = pkgversion.split "-"
-      pkgrel = javacppversion+pkgrel
-      pkgarch = arch 
+      @javacpp = true
+      @name = @artifactid.split("-platform").first
+      @pkgversion, @javacppversion = @pkgversion.split "-"
+      @pkgrel = @javacppversion+@pkgrel
+      @pkgarch = @arch 
     else
-        pkgversion = pkgversion.split("-").first
+        @pkgversion = @pkgversion.split("-").first
     end
     
-    ## 1. build the directory
+    create_directories()
+    pkgbuild = build_pkgbuild()
+    
+    # write pkgbuild
+    puts "writing pkgbuild..."
+    File.open(@foldername+"/PKGBUILD", 'w') { |file| file.write(pkgbuild) }
+
+    pom = build_pom()
+    puts "Writing pom..."
+    File.open(@foldername+"/pom.xml", 'w') { |file| file.write(pom) }
+
+    ## make the package
+    currentdir = Dir.pwd
+    Dir.chdir @foldername
+    `makepkg -f >> build.log`
+    `cp *.pkg.tar.xz ../pkgs`
+    Dir.chdir currentdir
+    
+    puts "Finished, you can check the folder #{@name}."
+
+  end
+
+  def create_directories()
     begin 
-      Dir.mkdir foldername
+      Dir.mkdir @foldername
       Dir.mkdir "pkgs"
     rescue => e
-
     end
-    
-    ## 2. create the PGKBUILD
-    pkgbuild = <<-PKGBUILD 
+  end
+
+  def build_pkgbuild
+
+    config = <<-CONFIG 
 # Maintainer: RealityTech <laviole@rea.lity.tech>
-pkgname=java-#{name}#{compact_pkg}
-pkgver=#{pkgversion}
-pkgrel=#{pkgrel}
+pkgname=java-#{@name}#{@compact_pkg}
+pkgver=#{@pkgversion}
+pkgrel=#{@pkgrel}
 pkgdesc=""
-arch=('#{pkgarch}')
+arch=('#{@pkgarch}')
 url=""
-license=('GPL')
+license=()
 groups=()
 depends=('java-runtime')
-makedepends=('maven' 'jdk8-openjdk' 'git')
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
+makedepends=('maven' 'jdk8-openjdk')
+provides=()
+conflicts=()
 replaces=()
 
 build() {
   cd "$startdir"
 
-PKGBUILD
+CONFIG
     
-    if javacpp
-      pkgbuild = pkgbuild + "  mvn dependency:copy-dependencies\n "
+    if @javacpp
+      config = config + "  mvn dependency:copy-dependencies\n "
     else
-      pkgbuild = pkgbuild + "  mvn dependency:copy-dependencies -Djavacpp.platform=#{platform}-#{arch} \n "
+      config = config + "  mvn dependency:copy-dependencies -Djavacpp.platform=#{@platform}-#{@arch} \n "
     end
 
-    if compact
-      pkgbuild = pkgbuild + "  mvn package -Djavacpp.platform=#{platform}-#{arch} \n "
+    if @compact
+      config = config + "  mvn package -Djavacpp.platform=#{@platform}-#{@arch} \n "
     end
 
     ## Continue building
-    pkgbuild2 = <<-PKGBUILD2
-    
+    package = <<-PACKAGE
 }
 
 package() {
 
-PKGBUILD2
+PACKAGE
 
-    # opencv-3.4.0-1.4.jar          ->  #{name}-#{version}-#{javacppversion}.jar
-    # opencv-platform-3.4.0-1.4.jar ->  #{name}-platform-#{version}-#{javacppversion}.jar
-    # opencv-3.4.0-1.4-linux-x86_64.jar ->  #{name}-#{version}-#{javacppversion}-#{platform}-#{arch}.jar
-    # javacpp-1.4.jar -> javacpp-#{javacppversion}.jar   ## Not sure yet!
 
-    if compact
-      pkgbuild3 = "  installCompact '#{name}' '#{artifactid}' '-jar-with-dependencies' \n"
+    if @compact
+      install = "  installCompact '#{@name}' '#{@artifactid}' '-jar-with-dependencies' \n"
       
     else 
-    
-      if full
-        pkgbuild3 = " installAll '#{name}'" 
-    else 
-      if javacpp
-        pkgbuild3 = <<-PKGBUILD3
+      
+      if @full
+        install = " installAll '#{@name}'" 
+      else 
+        if @javacpp
 
+          # opencv-3.4.0-1.4.jar          ->  #{name}-#{version}-#{javacppversion}.jar
+          # opencv-platform-3.4.0-1.4.jar ->  #{name}-platform-#{version}-#{javacppversion}.jar
+          # opencv-3.4.0-1.4-linux-x86_64.jar ->  #{name}-#{version}-#{javacppversion}-#{@platform}-#{@arch}.jar
+          # javacpp-1.4.jar -> javacpp-#{javacppversion}.jar   ## Not sure yet!
+
+          install = <<-INSTALL
          # jar-name, output-jar-name, link-name 
-        installJavaCPP '#{name}-#{pkgversion}-#{javacppversion}.jar' '#{name}-#{pkgversion}.jar' '#{name}.jar'       
-        installJavaCPP '#{name}-platform-#{pkgversion}-#{javacppversion}.jar' '#{name}-platform-#{pkgversion}.jar' '#{name}-platform.jar'       
- 
-        installJavaCPP '#{name}-#{pkgversion}-#{javacppversion}-#{platform}-#{arch}.jar' '#{name}-#{pkgversion}-#{platform}-#{arch}.jar' '#{name}-#{platform}-#{arch}.jar'       
+        installJavaCPP '#{@name}-#{@pkgversion}-#{@javacppversion}.jar' '#{@name}-#{@pkgversion}.jar' '#{@name}.jar'       
+        installJavaCPP '#{@name}-platform-#{@pkgversion}-#{@javacppversion}.jar' '#{@name}-platform-#{@pkgversion}.jar' '#{@name}-platform.jar'       
+        installJavaCPP '#{@name}-#{@pkgversion}-#{@javacppversion}-#{@platform}-#{@arch}.jar' '#{@name}-#{@pkgversion}-#{@platform}-#{@arch}.jar' '#{@name}-#{@platform}-#{@arch}.jar'       
 
-      PKGBUILD3
-        
-      else 
-        pkgbuild3 = <<-PKGBUILD3
+      INSTALL
+        else 
+          install = <<-INSTALL
  
-        installOne '#{name}' '#{artifactid}'
+        installOne '#{@name}' '#{@artifactid}'
 
-PKGBUILD3
-      end
+INSTALL
+        end
       end
     end
-      
- pkgbuild4 = <<-PKGBUILD4
+    
+    functions = <<-FUNCTIONS
 
 }
 
@@ -146,7 +164,7 @@ PKGBUILD3
      local name=$1
      local artifact=$2
      local opt=$3
-     install -m644 -D ${startdir}/target/dependency/${artifact}-#{version}${opt}.jar ${pkgdir}/usr/share/java/${name}/${pkgver}/${name}-${pkgver}.jar
+     install -m644 -D ${startdir}/target/dependency/${artifact}-#{@version}${opt}.jar ${pkgdir}/usr/share/java/${name}/${pkgver}/${name}-${pkgver}.jar
      cd ${pkgdir}/usr/share/java/
      ln -sr ${name}/${pkgver}/${name}-${pkgver}.jar $name.jar
      ln -sr ${name}/${pkgver}/${name}-${pkgver}.jar $name-${pkgver}.jar
@@ -156,12 +174,11 @@ PKGBUILD3
      local name=$1
      local artifact=$2
      local opt=$3
-     install -m644 -D ${startdir}/target/${name}-#{version}${opt}.jar ${pkgdir}/usr/share/java/${name}/${pkgver}/${name}-${pkgver}${opt}.jar
+     install -m644 -D ${startdir}/target/${name}-#{@version}${opt}.jar ${pkgdir}/usr/share/java/${name}/${pkgver}/${name}-${pkgver}${opt}.jar
      cd ${pkgdir}/usr/share/java/
      ln -sr ${name}/${pkgver}/${name}-${pkgver}${opt}.jar $name${opt}.jar
  }
 
-
  installAll() {
      local name=$1
      mkdir -p ${pkgdir}/usr/share/java/${name}-with-deps/${pkgver}
@@ -174,36 +191,37 @@ PKGBUILD3
      local jarname=$1
      local outputname=$2
      local name=$3
-     install -m644 -D ${startdir}/target/dependency/${jarname} ${pkgdir}/usr/share/java/#{name}/${pkgver}/${outputname}
+     install -m644 -D ${startdir}/target/dependency/${jarname} ${pkgdir}/usr/share/java/#{@name}/${pkgver}/${outputname}
      cd ${pkgdir}/usr/share/java/
-     ln -sr #{name}/${pkgver}/${outputname} $name
-     ln -sr #{name}/${pkgver}/${outputname} ${outputname}
+     ln -sr #{@name}/${pkgver}/${outputname} $name
+     ln -sr #{@name}/${pkgver}/${outputname} ${outputname}
  }
 
+FUNCTIONS
 
-PKGBUILD4
-
- ## Install in a maven-like environment ?
- ## ${groupId.replace('.','/')}/${artifactId}/${version}/${artifactId}-${version}${classifier==null?'':'-'+classifier}.${type}
+    ## Install in a maven-like environment ?
+    ## ${groupId.replace('.','/')}/${artifactId}/${version}/${artifactId}-${version}${classifier==null?'':'-'+classifier}.${type}
+    
+    pkgbuild =  config + package + install + functions
+    
+    return pkgbuild
+    
+  end
+  
 
-    pkgbuild = pkgbuild + pkgbuild2 + pkgbuild3 + pkgbuild4
- 
-    # write pkgbuild
-    puts "writing pkgbuild..."
-    File.open(foldername+"/PKGBUILD", 'w') { |file| file.write(pkgbuild) }
 
-    # create the POM
+  def build_pom
     
     pom = <<-POM
 <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>
     <groupId>tech.lity.rea</groupId>
-    <artifactId>#{name}</artifactId>
+    <artifactId>#{@name}</artifactId>
     <version>1-dummy</version>
     <packaging>jar</packaging>
 
-    <name>#{name}</name>
+    <name>#{@name}</name>
     <description></description>
     <url></url>
     
@@ -231,14 +249,14 @@ PKGBUILD4
     
     <dependencies>
       <dependency>
-	<groupId>#{groupid}</groupId>
-	<artifactId>#{artifactid}</artifactId>
-	<version>#{version}</version>
+	<groupId>#{@groupid}</groupId>
+	<artifactId>#{@artifactid}</artifactId>
+	<version>#{@version}</version>
       </dependency>
     </dependencies>
 POM
 
-    if compact
+    if @compact
       pom = pom + <<-POM2
 
     <build>
@@ -266,25 +284,7 @@ POM2
     end 
 
     pom = pom + " </project> "
-    
-    # write pom
-    puts "Writing pom..."
-    File.open(foldername+"/pom.xml", 'w') { |file| file.write(pom) }
-
-    currentdir = Dir.pwd
-    
-    Dir.chdir foldername
-    `makepkg -f >> build.log`
-    `cp *.pkg.tar.xz ../pkgs`
-    
-    Dir.chdir currentdir
-    
-    puts "Finished, you can check the folder #{name}."
-
+    return pom
   end
-
-
-
-
   
 end

data/lib/MavenToPKGBUILD/version.rb

@@ -1,3 +1,3 @@
 module MavenToPKGBUILD
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MavenToPKGBUILD
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jeremy Laviole
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler