1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00

Merge pull request #89 from joefiorini/packaging-cleanup

Packaging cleanup
This commit is contained in:
Joe Fiorini 2015-03-02 16:49:21 -05:00
commit 893d93990c
9 changed files with 29 additions and 65 deletions

2
.gitignore vendored
View File

@ -15,7 +15,7 @@ awx/*.log
tower/tower_warnings.log
celerybeat-schedule
awx/ui/static/docs
awx/ui/static/dist
awx/ui/dist
# Python & setuptools
__pycache__

View File

@ -2,10 +2,8 @@ recursive-include awx *.py
recursive-include awx/static *.ico
recursive-include awx/templates *.html
recursive-include awx/api/templates *.md
recursive-include awx/ui *.html
recursive-include awx/ui/static *.css *.ico *.png *.gif *.jpg *.gz
recursive-include awx/ui/static *.eot *.svg *.ttf *.woff *.otf
recursive-include awx/ui/static/lib *
recursive-include awx/ui/templates *.html
recursive-include awx/ui/dist *
recursive-include awx/playbooks *.yml
recursive-include awx/lib/site-packages *
recursive-include config *
@ -14,12 +12,7 @@ recursive-include config/rpm *
recursive-exclude awx devonly.py*
recursive-exclude awx/api/tests *
recursive-exclude awx/main/tests *
recursive-exclude awx/ui/static/lib/ansible *
recursive-exclude awx/settings local_settings.py*
include awx/ui/static/dist/tower.concat.js
include awx/ui/static/dist/tower.concat.map
include awx/ui/static/dist/tower.concat.js.gz
include awx/ui/static/js/config.js
include tools/scripts/request_tower_configuration.sh
include tools/scripts/ansible-tower
include tools/munin_monitors/*
@ -27,4 +20,3 @@ include tools/sosreport/*
include COPYING
prune awx/public
prune awx/projects
prune awx/ui/static/lib/jstree/_*

View File

@ -91,7 +91,7 @@ clean-grunt:
# Remove UI build files
clean-ui:
rm -rf awx/ui/static/dist
rm -rf awx/ui/dist
rm -rf awx/ui/static/docs
# Remove temporary build files, compiled Python files.
@ -277,7 +277,7 @@ package.json: packaging/grunt/package.template
sed -e 's#%NAME%#$(NAME)#;s#%VERSION%#$(VERSION)#;s#%GIT_REMOTE_URL%#$(GIT_REMOTE_URL)#;' $< > $@
sync_ui: node_modules Brocfile.js
$(NODE) tools/ui/timepiece.js awx/ui/static/dist
$(NODE) tools/ui/timepiece.js awx/ui/dist
# Update local npm install
node_modules: package.json
@ -285,14 +285,14 @@ node_modules: package.json
touch $@
devjs: node_modules clean-ui Brocfile.js bower.json Gruntfile.js
$(BROCCOLI) build awx/ui/static/dist -- --debug
$(BROCCOLI) build awx/ui/dist -- --debug
# Build minified JS/CSS.
minjs: node_modules clean-ui Brocfile.js
$(BROCCOLI) build awx/ui/static/dist -- --silent --no-debug --no-tests --compress
$(BROCCOLI) build awx/ui/dist -- --silent --no-debug --no-tests --compress
minjs_ci: node_modules clean-ui Brocfile.js
$(BROCCOLI) build awx/ui/static/dist -- --no-debug --compress
$(BROCCOLI) build awx/ui/dist -- --no-debug --compress
# Check .js files for errors and lint
jshint: node_modules Gruntfile.js

View File

@ -64,6 +64,7 @@ USE_L10N = True
USE_TZ = True
STATICFILES_DIRS = (
os.path.join(BASE_DIR, 'ui', 'dist'),
os.path.join(BASE_DIR, 'static'),
)

View File

@ -1,11 +1,4 @@
import ChromeSocketHelp from "tower/help/ChromeSocketHelp";
import FirefoxSocketHelp from "tower/help/FirefoxSocketHelp";
import InventoryGroups from "tower/help/InventoryGroups";
import SafariSocketHelp from "tower/help/SafariSocketHelp";
export
{ ChromeSocketHelp,
FirefoxSocketHelp,
InventoryGroups,
SafariSocketHelp
};
import "tower/help/ChromeSocketHelp";
import "tower/help/FirefoxSocketHelp";
import "tower/help/InventoryGroups";
import "tower/help/SafariSocketHelp";

View File

@ -1,9 +0,0 @@
import conversionService from './conversions.service'
import smartStatusGraph from './smart-status.directive'
import controller from './smart-status.controller'
export default
angular.module('systemStatus', [])
.service('conversions', conversionService)
.directive('smartStatusGraph', smartStatusGraph)
.controller('smartStatusLoad', controller);

View File

@ -1,25 +1,12 @@
import DashboardCounts from "tower/widgets/DashboardCounts";
import DashboardJobs from "tower/widgets/DashboardJobs";
import HostGraph from "tower/widgets/HostGraph";
import HostPieChart from "tower/widgets/HostPieChart";
import InventorySyncStatus from "tower/widgets/InventorySyncStatus";
import JobStatus from "tower/widgets/JobStatus";
import JobStatusGraph from "tower/widgets/JobStatusGraph";
import ObjectCount from "tower/widgets/ObjectCount";
import PortalJobs from "tower/widgets/PortalJobs";
import SCMSyncStatus from "tower/widgets/SCMSyncStatus";
import Stream from "tower/widgets/Stream";
import "tower/widgets/DashboardCounts";
import "tower/widgets/DashboardJobs";
import "tower/widgets/HostGraph";
import "tower/widgets/HostPieChart";
import "tower/widgets/InventorySyncStatus";
import "tower/widgets/JobStatus";
import "tower/widgets/JobStatusGraph";
import "tower/widgets/ObjectCount";
import "tower/widgets/PortalJobs";
import "tower/widgets/SCMSyncStatus";
import "tower/widgets/Stream";
export
{ DashboardCounts,
DashboardJobs,
HostGraph,
HostPieChart,
InventorySyncStatus,
JobStatus,
JobStatusGraph,
ObjectCount,
PortalJobs,
SCMSyncStatus,
Stream
};

View File

@ -16,14 +16,14 @@
<link rel="stylesheet" href="{{ STATIC_URL }}lib/codemirror/addon/lint/lint.css" />
<link rel="stylesheet" href="{{ STATIC_URL }}lib/novus-nvd3/nv.d3.css" type="text/css">
<link rel="stylesheet" href="{{ STATIC_URL }}dist/tower.min.css" type="text/css">
<link rel="stylesheet" href="{{ STATIC_URL }}tower.min.css" type="text/css">
<link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" />
<script>
var $basePath = "{{ STATIC_URL }}";
</script>
<script src="{{ STATIC_URL }}dist/tower.concat.js"></script>
<script src="{{ STATIC_URL }}tower.concat.js"></script>
</head>
<body>
@ -239,7 +239,7 @@
<div id="login-modal-dialog" style="display: none;"></div>
<div id="help-modal-dialog" style="display: none;"></div>
<div id="license-modal-dialog" style="display: none;"></div>
<div id="about-modal-dialog" style="display: none;" ng-include=" 'static/partials/cowsay-about.html ' "></div>
<div id="about-modal-dialog" style="display: none;" ng-include=" '{{ STATIC_URL }}partials/cowsay-about.html ' "></div>
<div id="custom-script-dialog" style="display:none;" > </div>
<div id='configure-tower-dialog' style="display:none" >
<div id="configure-jobs" ></div>

View File

@ -12,10 +12,10 @@ module.exports = function(config) {
frameworks: ['mocha', 'chai', 'sinon-chai', 'chai-as-promised'],
// list of files / patterns to load in the browser
files: [
'../static/dist/tower.concat.js',
'../dist/tower.concat.js',
'../static/lib/angular-mocks/angular-mocks.js',
'../static/lib/ember-cli-test-loader/test-loader.js',
'../static/dist/tests/**/*.js',
'../dist/tests/**/*.js',
'../tests/unit.js'
],