Skip to content

Commit 2b9f704

Browse files
committed
revel#1064 windows filepath fix
1 parent 65038b7 commit 2b9f704

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

revel.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ func Init(mode, importPath, srcPath string) {
141141
packaged = true
142142
}
143143

144-
RevelPath = path.Join(revelSourcePath, filepath.FromSlash(REVEL_IMPORT_PATH))
145-
BasePath = path.Join(SourcePath, filepath.FromSlash(importPath))
146-
AppPath = path.Join(BasePath, "app")
147-
ViewsPath = path.Join(AppPath, "views")
144+
RevelPath = filepath.Join(revelSourcePath, filepath.FromSlash(REVEL_IMPORT_PATH))
145+
BasePath = filepath.Join(SourcePath, filepath.FromSlash(importPath))
146+
AppPath = filepath.Join(BasePath, "app")
147+
ViewsPath = filepath.Join(AppPath, "views")
148148

149149
CodePaths = []string{AppPath}
150150

@@ -355,19 +355,19 @@ func ResolveImportPath(importPath string) (string, error) {
355355

356356
func addModule(name, importPath, modulePath string) {
357357
Modules = append(Modules, Module{Name: name, ImportPath: importPath, Path: modulePath})
358-
if codePath := path.Join(modulePath, "app"); DirExists(codePath) {
358+
if codePath := filepath.Join(modulePath, "app"); DirExists(codePath) {
359359
CodePaths = append(CodePaths, codePath)
360-
if viewsPath := path.Join(modulePath, "app", "views"); DirExists(viewsPath) {
360+
if viewsPath := filepath.Join(modulePath, "app", "views"); DirExists(viewsPath) {
361361
TemplatePaths = append(TemplatePaths, viewsPath)
362362
}
363363
}
364364

365-
INFO.Print("Loaded module ", path.Base(modulePath))
365+
INFO.Print("Loaded module ", filepath.Base(modulePath))
366366

367367
// Hack: There is presently no way for the testrunner module to add the
368368
// "test" subdirectory to the CodePaths. So this does it instead.
369369
if importPath == Config.StringDefault("module.testrunner", "github.com/revel/modules/testrunner") {
370-
CodePaths = append(CodePaths, path.Join(BasePath, "tests"))
370+
CodePaths = append(CodePaths, filepath.Join(BasePath, "tests"))
371371
}
372372
}
373373

skeleton/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ test
6767
* The [Getting Started with Revel](http://revel.github.io/tutorial/index.html).
6868
* The [Revel guides](http://revel.github.io/manual/index.html).
6969
* The [Revel sample apps](http://revel.github.io/samples/index.html).
70-
* The [API documentation](http://revel.github.io/docs/godoc/index.html).
70+
* The [API documentation](https://godoc.org/github.com/revel/revel).
7171

7272
## Contributing
7373
We encourage you to contribute to Revel! Please check out the [Contributing to Revel

version.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package revel
22

33
const (
44
// Current Revel version
5-
Version = "0.13.0"
5+
Version = "0.13.1"
66

77
// Latest commit date
8-
BuildDate = "2016-06-05"
8+
BuildDate = "2016-06-06"
99

1010
// Minimum required Go version
1111
MinimumGoVersion = ">= go1.4"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy