Skip to content

Added a filter for DataFiles to exlude the debian control folder #3

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
laher merged 2 commits into from
Oct 1, 2020
Merged

Added a filter for DataFiles to exlude the debian control folder #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c212ae3
Go fmt
stamp Oct 26, 2016
06ad667
Added a filter for DataFiles to exlude the debian control folder
stamp Oct 26, 2016
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
94 changes: 48 additions & 46 deletions debgen/deb_gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ package debgen
import (
"compress/gzip"
"fmt"
"github.com/debber/debber-v0.3/deb"
"github.com/debber/debber-v0.3/targz"
"log"
"io"
"math"
"log"
"math"
"os"
"path/filepath"
"strings"

"github.com/debber/debber-v0.3/deb"
"github.com/debber/debber-v0.3/targz"
)

//DebGenerator generates source packages using templates and some overrideable behaviours
Expand All @@ -37,7 +38,6 @@ type DebGenerator struct {
DataFiles map[string]string
}


//NewDebGenerator is a factory for SourcePackageGenerator.
func NewDebGenerator(debWriter *deb.Writer, buildParams *BuildParams) *DebGenerator {
dgen := &DebGenerator{DebWriter: debWriter, BuildParams: buildParams,
Expand Down Expand Up @@ -84,7 +84,7 @@ func (dgen *DebGenerator) GenControlArchive() error {
if err != nil {
return err
}
for _, srcPath := range dgen.DataFiles {
for _, srcPath := range dgen.DataFiles {
stat, err := os.Stat(srcPath)
if err != nil {
// we have no src files
Expand Down Expand Up @@ -223,7 +223,7 @@ func PrepareBasicDebGen(ctrl *deb.Control, build *BuildParams) ([]*DebGenerator,
debpara.Set(deb.MaintainerFName, sourcePara.Get(deb.MaintainerFName))
debpara.Set(deb.PriorityFName, sourcePara.Get(deb.PriorityFName))
//log.Printf("debPara: %+v", debpara)

dataFiles := map[string]string{}
//source package. TODO: find a better way to identify a sources-only .deb package.
if strings.HasSuffix(binPara.Get(deb.PackageFName), "-dev") {
Expand All @@ -235,25 +235,25 @@ func PrepareBasicDebGen(ctrl *deb.Control, build *BuildParams) ([]*DebGenerator,
}
log.Printf("sources matching glob: %+v", sources)
}*/
/*
sourcesDestinationDir := sourcePara.Get(deb.SourceFName) + "_" + sourcePara.Get(deb.VersionFName)
for _, sourceFinder := range build.SourceFinders {
sourcesRelativeTo := sourceFinder.BaseDir
var sourceDir string
if sourceFinder.IncludeDir != "" {
sourceDir = sourceFinder.IncludeDir
} else {
sourceDir = sourceFinder.BaseDir
}
sources, err := GlobForSources(sourcesRelativeTo, sourceDir, sourceFinder.Glob, sourceFinder.Target + sourcesDestinationDir, []string{build.TmpDir, build.DestDir})
if err != nil {
return nil, fmt.Errorf("Error resolving sources: %v", err)
}
for k, v := range sources {
dataFiles[k] = v
/*
sourcesDestinationDir := sourcePara.Get(deb.SourceFName) + "_" + sourcePara.Get(deb.VersionFName)
for _, sourceFinder := range build.SourceFinders {
sourcesRelativeTo := sourceFinder.BaseDir
var sourceDir string
if sourceFinder.IncludeDir != "" {
sourceDir = sourceFinder.IncludeDir
} else {
sourceDir = sourceFinder.BaseDir
}
sources, err := GlobForSources(sourcesRelativeTo, sourceDir, sourceFinder.Glob, sourceFinder.Target + sourcesDestinationDir, []string{build.TmpDir, build.DestDir})
if err != nil {
return nil, fmt.Errorf("Error resolving sources: %v", err)
}
for k, v := range sources {
dataFiles[k] = v
}
}
}
*/
*/
} else {
// no sources
}
Expand All @@ -266,7 +266,7 @@ func PrepareBasicDebGen(ctrl *deb.Control, build *BuildParams) ([]*DebGenerator,
} else {
defer cf.Close()
changelogGz := filepath.Join(build.TmpDir, "changelog.gz")
gzf, err := os.OpenFile(changelogGz, os.O_CREATE | os.O_WRONLY, 0644)
gzf, err := os.OpenFile(changelogGz, os.O_CREATE|os.O_WRONLY, 0644)
defer gzf.Close()
if err != nil {
return nil, fmt.Errorf("Error creating temp gzip file for changelog: %v", err)
Expand Down Expand Up @@ -335,11 +335,13 @@ func PrepareBasicDebGen(ctrl *deb.Control, build *BuildParams) ([]*DebGenerator,
}
*/
//add changelog



// add resources ...
debianPath := filepath.Join(dgen.BuildParams.ResourcesDir, DebianDir)
f := func(path string, info os.FileInfo, err2 error) error {
if path == debianPath {
return filepath.SkipDir
}
if info != nil && !info.IsDir() {
rel, err := filepath.Rel(build.ResourcesDir, path)
if err == nil {
Expand All @@ -354,27 +356,27 @@ func PrepareBasicDebGen(ctrl *deb.Control, build *BuildParams) ([]*DebGenerator,
if err != nil {
return nil, fmt.Errorf("%v", err)
}
/*
binFinders, ok := build.BinFinders[arch]
if ok {
for _, binFinder := range binFinders {
if binFinder.Glob != "" {
glob := filepath.Join(binFinder.BaseDir, binFinder.Glob)
bins, err := filepath.Glob(glob)
if err != nil {
return nil, fmt.Errorf("%v", err)
}
log.Printf("glob: %s, bins: %v", glob, bins)
//log.Printf("Binaries matching glob for '%s': %+v", arch, bins)
for _, bin := range bins {
target := binFinder.Target + "/" + bin
dgen.DataFiles[target] = bin
/*
binFinders, ok := build.BinFinders[arch]
if ok {
for _, binFinder := range binFinders {
if binFinder.Glob != "" {
glob := filepath.Join(binFinder.BaseDir, binFinder.Glob)
bins, err := filepath.Glob(glob)
if err != nil {
return nil, fmt.Errorf("%v", err)
}
log.Printf("glob: %s, bins: %v", glob, bins)
//log.Printf("Binaries matching glob for '%s': %+v", arch, bins)
for _, bin := range bins {
target := binFinder.Target + "/" + bin
dgen.DataFiles[target] = bin
}
}
}
}
}
*/
// log.Printf("All data files: %v", dgen.DataFiles)
*/
// log.Printf("All data files: %v", dgen.DataFiles)
}
}
return dgens, nil
Expand Down