Permalink
Browse files

New most prioritary properties files : `*.local.properties` used for …

…local instances of compiler explorer.
  • Loading branch information...
1 parent 58f4d8b commit cda82ad6888b6d29f098f01eba1fa4e0d066d17d @Sahnvour Sahnvour committed Oct 27, 2016
Showing with 7 additions and 5 deletions.
  1. +1 −0 .gitignore
  2. +4 −4 README.md
  3. +2 −1 app.js
View
@@ -4,3 +4,4 @@
/.bower-updated
/out
*.heapsnapshot
+etc/config/*.local.properties
View
@@ -25,10 +25,10 @@ running on port 10240 on your local machine: http://localhost:10240/
The `Makefile` will automatically install all the third party libraries needed to run; using `npm` to install server-side
components and `bower` to install all the client-facing libraries.
-If you want to point it at your own GCC or similar binaries,either edit the
-`etc/config/gcc-explorer.defaults.properties` or else make a new one with the name
-`gcc-explorer.YOURHOSTNAME.properties`. The config system leaves a lot to be desired,
-I'm working on porting [CCS](https://github.com/hellige/ccs-cpp) to javascript and then something more rational can be used.
+If you want to point it at your own GCC or similar binaries, either edit the `etc/config/gcc-explorer.defaults.properties` or else make a new one with the name
+`gcc-explorer.local.properties`. `*.local.properties` files have the highest priority when loading properties.
+
+The config system leaves a lot to be desired, I'm working on porting [CCS](https://github.com/hellige/ccs-cpp) to javascript and then something more rational can be used.
Feel free to raise an issue on [github](https://github.com/mattgodbolt/gcc-explorer/issues) or
[email me directly](mailto:matt@godbolt.org) for more help.
View
@@ -71,7 +71,8 @@ var propHierarchy = _.flatten([
return e + '.' + process.platform;
}),
process.platform,
- os.hostname()]);
+ os.hostname(),
+ 'local']);
console.log("properties hierarchy: " + propHierarchy.join(', '));
// Propagate debug mode if need be

0 comments on commit cda82ad

Please sign in to comment.