Browse Source

Move auto generated source to a package

Jakob Borg 12 years ago
parent
commit
b1ba976122
4 changed files with 8 additions and 7 deletions
  1. 5 0
      auto/gui.files.go
  2. 1 1
      build.sh
  3. 0 5
      gui.files.go
  4. 2 1
      gui.go

File diff suppressed because it is too large
+ 5 - 0
auto/gui.files.go


+ 1 - 1
build.sh

@@ -11,7 +11,7 @@ fi
 if [[ -z $1 ]] ; then
 	go build -ldflags "-X main.Version $version"
 elif [[ $1 == "embed" ]] ; then
-	embedder main gui > gui.files.go \
+	embedder auto gui > auto/gui.files.go \
 	&& go build -ldflags "-X main.Version $version"
 elif [[ $1 == "tar" ]] ; then
 	go build -ldflags "-X main.Version $version" \

File diff suppressed because it is too large
+ 0 - 5
gui.files.go


+ 2 - 1
gui.go

@@ -11,6 +11,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/calmh/syncthing/auto"
 	"github.com/calmh/syncthing/model"
 	"github.com/codegangsta/martini"
 	"github.com/cratonica/embed"
@@ -26,7 +27,7 @@ func startGUI(addr string, m *model.Model) {
 	router.Get("/rest/need", restGetNeed)
 	router.Get("/rest/system", restGetSystem)
 
-	fs, err := embed.Unpack(Resources)
+	fs, err := embed.Unpack(auto.Resources)
 	if err != nil {
 		panic(err)
 	}

Some files were not shown because too many files changed in this diff