diff --git a/.bzrignore b/.bzrignore index 03a40b21..69e69444 100644 --- a/.bzrignore +++ b/.bzrignore @@ -4,3 +4,5 @@ lib include src bin +static/json/pandora.json +static/js/pandora.js diff --git a/static/json/pandora.json b/static/json/pandora.json deleted file mode 100644 index 7a5f447e..00000000 --- a/static/json/pandora.json +++ /dev/null @@ -1,60 +0,0 @@ -[ - "js/pandora/Query.js", - "js/pandora/UI.js", - "js/pandora/URL.js", - "js/pandora/account.js", - "js/pandora/appPanel.js", - "js/pandora/autovalidate.js", - "js/pandora/backButton.js", - "js/pandora/browser.js", - "js/pandora/clipList.js", - "js/pandora/clipPlayer.js", - "js/pandora/contactForm.js", - "js/pandora/contentPanel.js", - "js/pandora/deleteListDialog.js", - "js/pandora/editor.js", - "js/pandora/eventsDialog.js", - "js/pandora/filesView.js", - "js/pandora/filter.js", - "js/pandora/filterDialog.js", - "js/pandora/findElement.js", - "js/pandora/folderBrowser.js", - "js/pandora/folderBrowserBar.js", - "js/pandora/folderBrowserList.js", - "js/pandora/folderList.js", - "js/pandora/folders.js", - "js/pandora/group.js", - "js/pandora/helpDialog.js", - "js/pandora/home.js", - "js/pandora/homePage.js", - "js/pandora/info.js", - "js/pandora/infoView.js", - "js/pandora/item.js", - "js/pandora/itemClips.js", - "js/pandora/leftPanel.js", - "js/pandora/list.js", - "js/pandora/listDialog.js", - "js/pandora/mainPanel.js", - "js/pandora/mediaView.js", - "js/pandora/menu.js", - "js/pandora/namesDialog.js", - "js/pandora/navigationView.js", - "js/pandora/orderButton.js", - "js/pandora/placesDialog.js", - "js/pandora/preferencesDialog.js", - "js/pandora/publicLists.js", - "js/pandora/rightPanel.js", - "js/pandora/sectionButtons.js", - "js/pandora/sectionSelect.js", - "js/pandora/sectionbar.js", - "js/pandora/siteDialog.js", - "js/pandora/sortSelect.js", - "js/pandora/status.js", - "js/pandora/statusbar.js", - "js/pandora/titlesDialog.js", - "js/pandora/toolbar.js", - "js/pandora/usersDialog.js", - "js/pandora/utils.js", - "js/pandora/videoPreview.js", - "js/pandora/viewSelect.js" -] \ No newline at end of file diff --git a/update.sh b/update.sh index 8e299f80..4572addd 100755 --- a/update.sh +++ b/update.sh @@ -3,7 +3,6 @@ base=`pwd` bzr pull http://code.0x2620.org/pandora/ cd static/oxjs bzr pull http://code.0x2620.org/oxjs/ -echo build oxjs -./tools/build/build.py >/dev/null -cd $base test -e src/python-ox && cd src/python-ox && bzr pull http://code.0x2620.org/python-ox/ +cd $base +cd pandora && ./manage.py update_static