Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Avoid duplicate SDK install dir - SPEC-1252
[src/xds/xds-server.git]
/
lib
/
xdsconfig
/
config.go
diff --git
a/lib/xdsconfig/config.go
b/lib/xdsconfig/config.go
index
3a82b44
..
ee20bd2
100644
(file)
--- a/
lib/xdsconfig/config.go
+++ b/
lib/xdsconfig/config.go
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017
-2018
"IoT.bzh"
* Author Sebastien Douheret <sebastien@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Author Sebastien Douheret <sebastien@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-23,10
+23,10
@@
import (
"os"
"path/filepath"
"os"
"path/filepath"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
"github.com/Sirupsen/logrus"
"github.com/codegangsta/cli"
"github.com/Sirupsen/logrus"
"github.com/codegangsta/cli"
- common "github.com/iotbzh/xds-common/golib"
- "github.com/iotbzh/xds-server/lib/xsapiv1"
)
// Config parameters (json format) of /config command
)
// Config parameters (json format) of /config command
@@
-56,6
+56,7
@@
const (
DefaultShareDir = "${HOME}/.xds/server/projects"
DefaultSTHomeDir = "${HOME}/.xds/server/syncthing-config"
DefaultSdkScriptsDir = "${EXEPATH}/sdks"
DefaultShareDir = "${HOME}/.xds/server/projects"
DefaultSTHomeDir = "${HOME}/.xds/server/syncthing-config"
DefaultSdkScriptsDir = "${EXEPATH}/sdks"
+ DefaultSdkDbUpdate = "startup"
)
// Init loads the configuration on start-up
)
// Init loads the configuration on start-up
@@
-85,7
+86,7
@@
func Init(cliCtx *cli.Context, log *logrus.Logger) (*Config, error) {
APIVersion: DefaultAPIVersion,
VersionGitTag: cliCtx.App.Metadata["git-tag"].(string),
Builder: xsapiv1.BuilderConfig{},
APIVersion: DefaultAPIVersion,
VersionGitTag: cliCtx.App.Metadata["git-tag"].(string),
Builder: xsapiv1.BuilderConfig{},
- SupportedSharing: map[string]bool{
/*FIXME USE folder.TypePathMap*/ "PathMap"
: true},
+ SupportedSharing: map[string]bool{
xsapiv1.TypePathMap
: true},
},
Options: Options{
},
Options: Options{
@@
-98,6
+99,7
@@
func Init(cliCtx *cli.Context, log *logrus.Logger) (*Config, error) {
WebAppDir: "webapp/dist",
ShareRootDir: dfltShareDir,
SdkScriptsDir: DefaultSdkScriptsDir,
WebAppDir: "webapp/dist",
ShareRootDir: dfltShareDir,
SdkScriptsDir: DefaultSdkScriptsDir,
+ SdkDbUpdate: DefaultSdkDbUpdate,
HTTPPort: DefaultPort,
SThgConf: &SyncThingConf{Home: dfltSTHomeDir},
LogsDir: "",
HTTPPort: DefaultPort,
SThgConf: &SyncThingConf{Home: dfltSTHomeDir},
LogsDir: "",