Skip to content
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

Jump to bottom

Makefile changes for Windows and easier development #6103

Merged
merged 9 commits into from
Feb 20, 2019
Merged

Makefile changes for Windows and easier development #6103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
745cc7b
Added Go Path and node_modules to PATH
jolheiser Feb 17, 2019
dfebcbc
Merge branch 'master' into windows_dev
jolheiser Feb 18, 2019
8974c25
Requested changes
jolheiser Feb 18, 2019
7ed09b5
Merge branch 'master' into windows_dev
jolheiser Feb 18, 2019
ccc1bc7
Merge branch 'master' of https://github.com/go-gitea/gitea into windo…
jolheiser Feb 19, 2019
08abb21
Moved export down below GO variable and used the variable instead of …
jolheiser Feb 19, 2019
2c47106
Merge branch 'master' into windows_dev
jolheiser Feb 20, 2019
30eab86
Added note about installing Node 8.0+ to generate stylesheets
jolheiser Feb 20, 2019
99ff335
Added preferred Node version to CONTRIBUTING.md
jolheiser Feb 20, 2019
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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ included in the next released version.
Generally, the go build tools are installed as-needed in the `Makefile`.
An exception are the tools to build the CSS and images.

- To build CSS: Install [Node.js](https://nodejs.org/en/download/package-manager)
- To build CSS: Install [Node.js](https://nodejs.org/en/download/package-manager) at version 8.0 or above
with `npm` and then run `npm install` and `make generate-stylesheets`.
- To build Images: ImageMagick, inkscape and zopflipng binaries must be
available in your `PATH` to run `make generate-images`.
Expand Down
12 changes: 9 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ IMPORT := code.gitea.io/gitea
GO ?= go
SED_INPLACE := sed -i

export PATH := $($(GO) env GOPATH)/bin:$(PATH)

ifeq ($(OS), Windows_NT)
EXECUTABLE := gitea.exe
else
Expand Down Expand Up @@ -365,10 +367,14 @@ stylesheets-check: generate-stylesheets

.PHONY: generate-stylesheets
generate-stylesheets:
@hash npx > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
echo "Please install npm version 5.2+"; \
exit 1; \
fi;
$(eval BROWSERS := "> 2%, last 2 firefox versions, last 2 safari versions")
node_modules/.bin/lessc --clean-css public/less/index.less public/css/index.css
$(foreach file, $(filter-out public/less/themes/_base.less, $(wildcard public/less/themes/*)),node_modules/.bin/lessc --clean-css public/less/themes/$(notdir $(file)) > public/css/theme-$(notdir $(call strip-suffix,$(file))).css;)
$(foreach file, $(wildcard public/css/*),node_modules/.bin/postcss --use autoprefixer --autoprefixer.browsers $(BROWSERS) -o $(file) $(file);)
npx lessc --clean-css public/less/index.less public/css/index.css
$(foreach file, $(filter-out public/less/themes/_base.less, $(wildcard public/less/themes/*)),npx lessc --clean-css public/less/themes/$(notdir $(file)) > public/css/theme-$(notdir $(call strip-suffix,$(file))).css;)
$(foreach file, $(wildcard public/css/*),npx postcss --use autoprefixer --autoprefixer.browsers $(BROWSERS) -o $(file) $(file);)

.PHONY: swagger-ui
swagger-ui:
Expand Down
2 changes: 2 additions & 0 deletions docs/content/doc/advanced/hacking-on-gitea.en-us.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ make vet lint misspell-check

### Updating the stylesheets

To generate the stylsheets, you will need [Node.js](https://nodejs.org/) at version 8.0 or above.

At present we use [less](http://lesscss.org/) and [postcss](https://postcss.org) to generate our stylesheets. Do
**not** edit the files in `public/css/` directly as they are generated from
`lessc` from the files in `public/less/`.
Expand Down