From 787d828baac592ca052c40eb6dbe56f7668aa349 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Mon, 26 Dec 2011 18:17:35 -0500 Subject: [PATCH] Remove dependency on the closure library in the comiple step --- build.py | 3 +-- web_frontend/actor.js | 5 +---- web_frontend/file.js | 6 ++---- web_frontend/main.js | 6 +----- web_frontend/path_control.js | 2 +- web_frontend/tv_renamer.js | 2 +- web_frontend/version.js | 2 +- 7 files changed, 8 insertions(+), 18 deletions(-) diff --git a/build.py b/build.py index f6be025..d350375 100755 --- a/build.py +++ b/build.py @@ -161,8 +161,7 @@ def _CompileFrontEnd(options): output = "script" if options.compile_fe: output = "compiled" - args.extend([ '-p', closure_sources, '-o', output, '-c', CLOSURE_COMPILER, - '--output_file', outfile ]) + args.extend([ '-o', output, '-c', CLOSURE_COMPILER, '--output_file', outfile ]) print ' ' + ' '.join(args) handle = subprocess.Popen(args, stdout = sys.stdout, stderr = sys.stderr) handle.wait() diff --git a/web_frontend/actor.js b/web_frontend/actor.js index 8925dbe..8470b0b 100644 --- a/web_frontend/actor.js +++ b/web_frontend/actor.js @@ -7,10 +7,7 @@ // Foundation, either version 3 of the License, or any later version. // -goog.provide('armadillo.Actor'); - -goog.require('armadillo.PathControl'); -goog.require('armadillo.TVRenamer'); +$.namespace('armadillo.Actor'); /** * The Actor is a popup that displays the various actions that can be performed diff --git a/web_frontend/file.js b/web_frontend/file.js index 66e758f..d95c351 100644 --- a/web_frontend/file.js +++ b/web_frontend/file.js @@ -1,15 +1,13 @@ // // Armadillo File Manager -// Copyright (c) 2010, Robert Sesek +// Copyright (c) 2010-2011, Robert Sesek // // This program is free software: you can redistribute it and/or modify it under // the terms of the GNU General Public License as published by the Free Software // Foundation, either version 3 of the License, or any later version. // -goog.provide('armadillo.File'); - -goog.require('armadillo.Actor'); +$.namespace('armadillo.File'); /** * A file in a directory listing. diff --git a/web_frontend/main.js b/web_frontend/main.js index eff6bde..f769e8a 100644 --- a/web_frontend/main.js +++ b/web_frontend/main.js @@ -7,11 +7,7 @@ // Foundation, either version 3 of the License, or any later version. // -goog.provide('armadillo'); -goog.provide('armadillo.App'); - -goog.require('armadillo.File'); -goog.require('armadillo.Version'); +$.namespace('armadillo.App'); armadillo.App = function() { var start_path = '/'; diff --git a/web_frontend/path_control.js b/web_frontend/path_control.js index e7ea70e..c72689b 100644 --- a/web_frontend/path_control.js +++ b/web_frontend/path_control.js @@ -7,7 +7,7 @@ // Foundation, either version 3 of the License, or any later version. // -goog.provide('armadillo.PathControl'); +$.namespace('armadillo.PathControl'); /** * Creates a new path editing control for a given path. diff --git a/web_frontend/tv_renamer.js b/web_frontend/tv_renamer.js index 296a553..de9caa0 100644 --- a/web_frontend/tv_renamer.js +++ b/web_frontend/tv_renamer.js @@ -7,7 +7,7 @@ // Foundation, either version 3 of the License, or any later version. // -goog.provide('armadillo.TVRenamer'); +$.namespace('armadillo.TVRenamer'); /** * Creates a helper to rename a file in a pretty format for TV episodes. diff --git a/web_frontend/version.js b/web_frontend/version.js index 8e2ea93..19c454f 100644 --- a/web_frontend/version.js +++ b/web_frontend/version.js @@ -7,7 +7,7 @@ // Foundation, either version 3 of the License, or any later version. // -goog.provide('armadillo.Version'); +$.namespace('armadillo.Version'); armadillo.Version.MAJOR = 0; armadillo.Version.MINOR = 7; -- 2.22.5