idk/gojava
1
0
Fork 0
mirror of https://github.com/go-i2p/gojava.git synced 2025-07-03 17:59:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Gofmt

Browse Source
This commit is contained in:
sridharv
2016-03-28 17:23:28 +02:00
parent 94abcd0da0
commit 7a0cf30d95
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gojava.go
View File

@ -18,8 +18,8 @@ import (
"archive/zip" "archive/zip"
"runtime" "runtime"
"github.com/sridharv/gomobile-java/bind"
"flag" "flag"
"github.com/sridharv/gomobile-java/bind"
) )
func runCommand(cmd string, args ...string) error { func runCommand(cmd string, args ...string) error {
@ -32,7 +32,7 @@ func runCommand(cmd string, args ...string) error {
var javaHome = os.Getenv("JAVA_HOME") var javaHome = os.Getenv("JAVA_HOME")
var cwd string var cwd string
func initBuild() (string, func (), error) { func initBuild() (string, func(), error) {
if javaHome == "" { if javaHome == "" {
return "", nil, fmt.Errorf("$JAVA_HOME not set") return "", nil, fmt.Errorf("$JAVA_HOME not set")
} }
@ -44,7 +44,7 @@ func initBuild() (string, func (), error) {
if err != nil { if err != nil {
return "", nil, err return "", nil, err
} }
return tmpDir, func () { return tmpDir, func() {
os.RemoveAll(tmpDir) os.RemoveAll(tmpDir)
os.Chdir(cwd) os.Chdir(cwd)
}, nil }, nil
@ -81,8 +81,8 @@ func createDirs(dirs ...string) error {
func bindPackages(bindDir, javaDir string, pkgs []*types.Package) ([]string, error) { func bindPackages(bindDir, javaDir string, pkgs []*types.Package) ([]string, error) {
fs, javaFiles := token.NewFileSet(), make([]string, 0) fs, javaFiles := token.NewFileSet(), make([]string, 0)
for _, p := range pkgs { for _, p := range pkgs {
goFile := filepath.Join(bindDir, "go_" + p.Name() + "main.go") goFile := filepath.Join(bindDir, "go_"+p.Name()+"main.go")
f, err := os.OpenFile(goFile, os.O_CREATE | os.O_RDWR, 0600) f, err := os.OpenFile(goFile, os.O_CREATE|os.O_RDWR, 0600)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to open: %s: %v", goFile, err) return nil, fmt.Errorf("failed to open: %s: %v", goFile, err)
} }
@ -97,10 +97,10 @@ func bindPackages(bindDir, javaDir string, pkgs []*types.Package) ([]string, err
if err := bindJava(javaDir, javaFile, conf, int(bind.Java)); err != nil { if err := bindJava(javaDir, javaFile, conf, int(bind.Java)); err != nil {
return nil, err return nil, err
} }
if err := bindJava(bindDir, "java_" + p.Name() + ".c", conf, int(bind.JavaC)); err != nil { if err := bindJava(bindDir, "java_"+p.Name()+".c", conf, int(bind.JavaC)); err != nil {
return nil, err return nil, err
} }
if err := bindJava(bindDir, p.Name() + ".h", conf, int(bind.JavaH)); err != nil { if err := bindJava(bindDir, p.Name()+".h", conf, int(bind.JavaH)); err != nil {
return nil, err return nil, err
} }
javaFiles = append(javaFiles, filepath.Join(javaDir, javaFile)) javaFiles = append(javaFiles, filepath.Join(javaDir, javaFile))
@ -314,7 +314,7 @@ This generates a jar containing Java bindings to the specified Go packages.
func main() { func main() {
o := flag.String("o", "libgojava.jar", "Path to the generated jar file") o := flag.String("o", "libgojava.jar", "Path to the generated jar file")
flag.Usage = func () { flag.Usage = func() {
fmt.Fprintln(os.Stderr, usage) fmt.Fprintln(os.Stderr, usage)
flag.PrintDefaults() flag.PrintDefaults()
} }
@ -327,4 +327,4 @@ func main() {
fmt.Fprintln(os.Stderr, err) fmt.Fprintln(os.Stderr, err)
os.Exit(1) os.Exit(1)
} }
} }

10
gojava_test.go
View File

@ -3,11 +3,11 @@ package main
import ( import (
"testing" "testing"
"io/ioutil"
"path/filepath"
"os/exec"
"os"
"flag" "flag"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
) )
var javaTest = flag.String("javatest", ".*", "Run only java tests matching the regular expression") var javaTest = flag.String("javatest", ".*", "Run only java tests matching the regular expression")
@ -36,7 +36,7 @@ func TestJavaBind(t *testing.T) {
if err := runCommand("javac", "-cp", jar, "-d", tmpDir, toCopy[0].dst, toCopy[1].dst); err != nil { if err := runCommand("javac", "-cp", jar, "-d", tmpDir, toCopy[0].dst, toCopy[1].dst); err != nil {
t.Fatal(err) t.Fatal(err)
} }
cmd := exec.Command("java", "-cp", jar + ":" + tmpDir, "go.MoreAsserts", *javaTest) cmd := exec.Command("java", "-cp", jar+":"+tmpDir, "go.MoreAsserts", *javaTest)
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {