Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

feat: add build path

a.i.kuleshov3a6ac93f0e0b
diff --git a/cmd/command.go b/cmd/command.go
index 5b3bb700..03194dc3 100644
--- a/cmd/command.go
+++ b/cmd/command.go
@@ -38,6 +38,8 @@ var (
dataDirPath string
// dumpDataPath dump data path
dumpDataPath string
+ // place to build new answer
+ buildDir string
// plugins needed to build in answer application
buildWithPlugins []string
// build output path
@@ -60,6 +62,8 @@ func init() {
buildCmd.Flags().StringVarP(&buildOutput, "output", "o", "", "build output path")
+ buildCmd.Flags().StringVarP(&buildDir, "build-dir", "b", "", "dir for build process")
+
upgradeCmd.Flags().StringVarP(&upgradeVersion, "from", "f", "", "upgrade from specific version, eg: -f v1.1.0")
configCmd.Flags().StringSliceVarP(&configFields, "with", "w", []string{}, "the fields that need to be set to the default value, eg: -w allow_password_login")
@@ -209,7 +213,7 @@ To run answer, use:
Long: `Build a new Answer with plugins that you need`,
Run: func(_ *cobra.Command, _ []string) {
fmt.Printf("try to build a new answer with plugins:\n%s\n", strings.Join(buildWithPlugins, "\n"))
- err := cli.BuildNewAnswer(buildOutput, buildWithPlugins, cli.OriginalAnswerInfo{
+ err := cli.BuildNewAnswer(buildDir, buildOutput, buildWithPlugins, cli.OriginalAnswerInfo{
Version: Version,
Revision: Revision,
Time: Time,
diff --git a/internal/cli/build.go b/internal/cli/build.go
index 3adffafc..af15e69c 100644
--- a/internal/cli/build.go
+++ b/internal/cli/build.go
@@ -94,10 +94,14 @@ type pluginInfo struct {
Version string
}
-func newAnswerBuilder(outputPath string, plugins []string, originalAnswerInfo OriginalAnswerInfo) *answerBuilder {
+func newAnswerBuilder(buildDir, outputPath string, plugins []string, originalAnswerInfo OriginalAnswerInfo) *answerBuilder {
material := &buildingMaterial{originalAnswerInfo: originalAnswerInfo}
parentDir, _ := filepath.Abs(".")
- material.tmpDir, _ = os.MkdirTemp(parentDir, "answer_build")
+ if buildDir != "" {
+ material.tmpDir = buildDir
+ } else {
+ material.tmpDir, _ = os.MkdirTemp(parentDir, "answer_build")
+ }
if len(outputPath) == 0 {
outputPath = filepath.Join(parentDir, "new_answer")
}
@@ -117,8 +121,8 @@ func (a *answerBuilder) DoTask(task func(b *buildingMaterial) error) {
}
// BuildNewAnswer builds a new answer with specified plugins
-func BuildNewAnswer(outputPath string, plugins []string, originalAnswerInfo OriginalAnswerInfo) (err error) {
- builder := newAnswerBuilder(outputPath, plugins, originalAnswerInfo)
+func BuildNewAnswer(buildDir, outputPath string, plugins []string, originalAnswerInfo OriginalAnswerInfo) (err error) {
+ builder := newAnswerBuilder(buildDir, outputPath, plugins, originalAnswerInfo)
builder.DoTask(createMainGoFile)
builder.DoTask(downloadGoModFile)
builder.DoTask(copyUIFiles)