Merge 6992b4e into 2556645

Songmu · Apr 27, 2019 · 7d65650 · 7d65650
2 parents 2556645 + 6992b4e
commit 7d65650
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/builder.go b/builder.go
@@ -23,6 +23,7 @@ type builder struct {
 	workDirBase                     string
 	zipAlways                       bool
 	resources                       []string
+	projDir                         string
 }
 
 func (bdr *builder) build() (string, error) {
@@ -88,7 +89,11 @@ func (bdr *builder) build() (string, error) {
 	}
 
 	for _, rc := range bdr.resources {
-		dest := filepath.Join(workDir, filepath.Base(rc))
+		rel, _ := filepath.Rel(bdr.projDir, rc)
+		dest := filepath.Join(workDir, rel)
+		if err := os.MkdirAll(filepath.Dir(dest), 0755); err != nil {
+			return "", err
+		}
 		if err := os.Link(rc, dest); err != nil {
 			return "", err
 		}

diff --git a/goxz.go b/goxz.go
@@ -274,6 +274,7 @@ func (gx *goxz) builders() []*builder {
 			zipAlways:    gx.zipAlways,
 			workDirBase:  gx.workDir,
 			resources:    gx.resources,
+			projDir:      gx.projDir,
 		}
 	}
 	return builders