Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  Bump version to 2.1.0
  Update copyright year to 2017.
  Correct a contributor’s name.
  Update the compilers.
  Add a build system for making releases using gulp.
  Add a workaround a bug in nwjs/nw.js#5513
  Update the URL to be relative.
  Replace `require(‘nw.gui’)` with the global `nw`.
  Remove setting the `localStorage` of the `global`. It’s set by default.
  Improve the feature
  Use JSON files and update default JSON config files
  Support for AutoPrefix Config on CSS, LESS and Sass
  change the default value of maxBuffer #162
  • Loading branch information
zaygraveyard committed Apr 25, 2017
2 parents 27fc00d + 95bac2b commit 45430bb
Show file tree
Hide file tree
Showing 53 changed files with 1,043 additions and 207 deletions.
56 changes: 30 additions & 26 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
*.sublime-project
*.sublime-workspace
test
tests
benchmark
example
extra
build
nw
nw.pak
src/.sass-cache
src/node-webkit.app
src/ruby
src/node_modules/.bin
src/node_modules/clean-css
src/node_modules/coffee-script
src/node_modules/dustjs-linkedin
src/node_modules/less
src/node_modules/uglify-js
src/node_modules/autoprefixer
src/rubygems/bin
src/rubygems/gems
src/rubygems/specifications
*.DS_Store
*.map
.idea
*.sublime-project
*.sublime-workspace
test
tests
benchmark
example
extra
build
nw
nw.pak
src/.sass-cache
src/node-webkit.app
src/ruby
src/node_modules/.bin
src/node_modules/clean-css
src/node_modules/coffee-script
src/node_modules/dustjs-linkedin
src/node_modules/less
src/node_modules/uglify-js
src/node_modules/autoprefixer
src/rubygems
src/rubygems/bin
src/rubygems/gems
src/rubygems/specifications
*.DS_Store
*.map
.idea
node_modules
cache
dist
19 changes: 19 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
## 2.1.0
2017-04-23

* change the default value of maxBuffer #162
* support for AutoPrefix Config on CSS, LESS and Sass
* fix backslashes in map source paths on Windows
* update `node-webkit` to the latest version of `nwjs`
* update LESS(@1.7.5), Sass(@3.4.23), Compass(@1.0.3), CoffeeScript(@1.12.4), uglify-js(@2.8.21), and clean-css(@4.0.10)

Download:
* [Windows](https://drive.google.com/open?id=0B-tHQW4o9rnYak54ak1MWk9FWjQ)
* [macOS](https://drive.google.com/open?id=0B-tHQW4o9rnYTVlPampRdmVSeEE)
* [Linux 32 bit](https://drive.google.com/open?id=0B-tHQW4o9rnYTUhBWXdoUXhWVWc)
* [Linux 64 bit](https://drive.google.com/open?id=0B-tHQW4o9rnYWmtqVTlTSW11cjA)
* [Debian 32 bit](https://drive.google.com/open?id=0B-tHQW4o9rnYNlpTZ0U4SjhCODg)
* [Debian 64 bit](https://drive.google.com/open?id=0B-tHQW4o9rnYUmxLa05fbWFsUEE)
* [RPM 32 bit](https://drive.google.com/open?id=0B-tHQW4o9rnYM084RlV5V3RzQTA)
* [RPM 64 bit](https://drive.google.com/open?id=0B-tHQW4o9rnYWVNBT3JLNmtKOTg)

## 2.0.4
2014-12-06

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Koala is a GUI application for LESS, Sass and CoffeeScript compilation, to help
[项目中文主页](http://koala-app.com/index-zh.html)

## Downloads
v2.0.3 release [Changelog](https://github.com/oklai/koala/blob/master/Changelog.md)
v2.1.0 release [Changelog](https://github.com/oklai/koala/blob/master/Changelog.md)

[Download](http://koala-app.com)

Expand Down
4 changes: 4 additions & 0 deletions assets-linux/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Linux related assets

- `after-install` and `after-remove` scripts
- `starter.desktop` and icons for launchers
7 changes: 7 additions & 0 deletions assets-linux/after-install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

# Link to the binary
ln -sf /usr/share/koala/Koala /usr/local/bin/koala

# Launcher icon
desktop-file-install /usr/share/koala/koala.desktop
7 changes: 7 additions & 0 deletions assets-linux/after-remove.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

# Link to the binary
rm -f /usr/local/bin/koala

# Launcher files
rm -f /usr/share/applications/koala.desktop
Binary file added assets-linux/icons/hicolor/128x128/apps/koala.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets-linux/icons/hicolor/16x16/apps/koala.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets-linux/icons/hicolor/22x22/apps/koala.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets-linux/icons/hicolor/24x24/apps/koala.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets-linux/icons/hicolor/32x32/apps/koala.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets-linux/icons/hicolor/48x48/apps/koala.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets-linux/icons/hicolor/64x64/apps/koala.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions assets-linux/koala.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[Desktop Entry]
Name=Koala
Version=1.0
Exec=koala
Comment=A cool tool for web developers
Icon=koala
Type=Application
Terminal=false
StartupNotify=true
Encoding=UTF-8
Categories=Development;GTK;GNOME;
3 changes: 3 additions & 0 deletions assets-osx/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# OS X related assets

- `dmg.json` config file for node-appdmg
10 changes: 10 additions & 0 deletions assets-osx/dmg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"title": "Koala",
"icon": "dmg_icon.icns",
"background": "dmg_bg.png",
"icon-size": 80,
"contents": [
{ "x": 448, "y": 344, "type": "link", "path": "/Applications" },
{ "x": 192, "y": 344, "type": "file", "path": "../build/Koala/osx64/Koala.app" }
]
}
Binary file added assets-osx/dmg_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets-osx/dmg_bg@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets-osx/dmg_icon.icns
Binary file not shown.
Binary file added assets-osx/icon.icns
Binary file not shown.
3 changes: 3 additions & 0 deletions assets-windows/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Windows related assets

- `installer.nsi` config file for nsis
Binary file added assets-windows/icon.ico
Binary file not shown.
58 changes: 58 additions & 0 deletions assets-windows/installer.nsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
!include "MUI2.nsh"

Name "Koala"
BrandingText "koala-app.com"

# set the icon
!define MUI_ICON "icon.ico"

# define the resulting installer's name:
OutFile "..\dist\KoalaSetup.exe"

# set the installation directory
InstallDir "$PROGRAMFILES\Koala\"

# app dialogs
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_INSTFILES

!define MUI_FINISHPAGE_RUN_TEXT "Start Koala"
!define MUI_FINISHPAGE_RUN "$INSTDIR\Koala.exe"

!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_LANGUAGE "English"

# default section start
Section

# delete the installed files
RMDir /r $INSTDIR

# define the path to which the installer should install
SetOutPath $INSTDIR

# specify the files to go in the output path
File /r ..\build\Koala\win32\*

# create the uninstaller
WriteUninstaller "$INSTDIR\Uninstall Koala.exe"

# create shortcuts in the start menu and on the desktop
CreateShortCut "$SMPROGRAMS\Koala.lnk" "$INSTDIR\Koala.exe"
CreateShortCut "$SMPROGRAMS\Uninstall Koala.lnk" "$INSTDIR\Uninstall Koala.exe"
CreateShortCut "$DESKTOP\Koala.lnk" "$INSTDIR\Koala.exe"

SectionEnd

# create a section to define what the uninstaller does
Section "Uninstall"

# delete the installed files
RMDir /r $INSTDIR

# delete the shortcuts
Delete "$SMPROGRAMS\Koala.lnk"
Delete "$SMPROGRAMS\Uninstall Koala.lnk"
Delete "$DESKTOP\Koala.lnk"

SectionEnd
Loading

0 comments on commit 45430bb

Please sign in to comment.