Commit graph

14 commits

Author SHA1 Message Date
Jo-Philipp Wich
d7d97723fe luci.mk: add simple cache buster
Append a ?v=version string to any media or resource URL that has a .js or .css
extension.

Also substitute placeholders in the form <%# xxxPKG_VERSION %> where
xxx is replaced verbatim and PKG_VERSION with the actual version, e.g.
<%# ?x=PKG_VERSION %> will result in "?x=git-16.237.30043-f885853".

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-11-01 16:50:50 +01:00
Matthias Schiffer
4d97a9f698
luci-base: use default install paths for host utils
This reverts commit d4c3372020.

PATH inconsistencies and Host/Install arguments have been fixed in both
LEDE and OpenWrt, so we can revert the revert.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-10-09 22:44:15 +02:00
Jo-Philipp Wich
d4c3372020 Revert "luci-base: use default install paths for host utils"
This reverts commit 87a7570690.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-10-05 01:44:02 +02:00
Matthias Schiffer
87a7570690 luci-base: use default install paths for host utils
Also, don't make any assumptions about the staging dir lua and LuaSrcDiet
were installed to.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-10-03 18:07:43 +02:00
Kevin Darbyshire-Bryant
4580faaa5e luci-base: fix lua interpreter location
An lua interpreter is required on the building host to run the
luasrcdiet lua script.  Due to a build change, the interpreter was not
being installed to the correct location.

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
2016-06-03 10:24:09 +01:00
Hannu Nyman
7553654bb1 LuCI: Display the proper LuCI git branch in GUI
Adjust luci.mk and luci-base to find out correctly if Luci is built
from master or from a branch. Display that value in the footer and
the overview page.

* Evaluate the git branch in luci.mk and pass that to LuCI submodules
  as a make variable. Use branch name, ignore tags.
* Deprecate svn detection in luci-base's mkversion.sh that generates
  version.lua. Simply use the value passed by make.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2016-03-10 19:50:58 +02:00
Hannu Nyman
1d37c9c25d luci.mk: correct SK language name to Slovak
SK language code refers to Slovak, not Slovene.
Native language name is correct.

References:
https://forum.openwrt.org/viewtopic.php?id=60235
https://en.wikipedia.org/wiki/Slovak_language

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2015-10-13 10:13:50 +03:00
Jo-Philipp Wich
c38b4cdffa luci.mk: don't builtin translations selected by CONFIG_ALL
Make sure that translation packages enabled through CONFIG_ALL
that depend on builtin packages are restricted to modules.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-05-05 10:32:15 +02:00
Jo-Philipp Wich
d1c1423eba build: remove *.luadoc files before packaging 2015-01-28 22:29:03 +01:00
Jo-Philipp Wich
52ecc90b31 luci.mk: expose option to override PKGARCH (#295)
Also mark packages without src/ as arch independant by default.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-18 17:27:16 +01:00
Christian Schoenebeck
b6d700eeef luci.mk: cosmetic change for translation description
Sample:
old: "Deutsch (German)"
new: "Translation for luci-app-ddns - Deutsch (German)"

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2015-01-11 17:10:32 +01:00
Jo-Philipp Wich
1ce2d8f46a build: rework language dependencies
Rework the language package dependencies to avoid introducing unnecessary
depends. The luci-i18n-$app-$lang packages now depend on luci-$app.

 * When a language is selected as <*> then the language packs for each
   enabled LuCI module are built into the image
 * When a language is selected as <m> then the language packs for each
   enabled LuCI module are built as package
 * When CONFIG_ALL is set (e.g. release builds, snapshots) then all
   language packs are built

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-10 23:36:26 +01:00
Jo-Philipp Wich
a36807b942 build: fix language dependency handling
Turn language selection into a tristate, this allows building language
packages without having them included in the image.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-10 14:20:18 +01:00
Jo-Philipp Wich
1bb4822dca Rework LuCI build system
* Rename subdirectories to their repective OpenWrt package names
 * Make each LuCI module its own standalone package
 * Deploy a shared luci.mk which is used by each module Makefile

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-01-08 16:26:20 +01:00