Skip to content

Commit

Permalink
Removal of last APF references
Browse files Browse the repository at this point in the history
- apf and apf-packaged references removed
- Contributes to #93
  • Loading branch information
exsilium committed Sep 15, 2020
1 parent cd8aab8 commit 37dbb66
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 34 deletions.
24 changes: 3 additions & 21 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,27 +1,9 @@
.PHONY: apf ext worker mode theme package test
.PHONY: ext worker mode theme package test

default: apf worker
default: worker

update: worker

# packages apf
apf:
cd node_modules/apf-packager && ln -sf ../../apf node_modules/apf && npm run build
cp node_modules/apf-packager/build/apf_release_cleaned.js ./plugins-client/lib.apf/www/apf-packaged/apf_release.js

# package debug version of apf
apfdebug:
cd node_modules/packager/projects; cat apf_cloud9.apr | sed 's/<p:define name=\"__DEBUG\" value=\"0\" \/>/<p:define name=\"__DEBUG\" value=\"1\" \/>/g' > apf_cloud9_debug2.apr
cd node_modules/packager/projects; cat apf_cloud9_debug2.apr | sed 's/apf_release/apf_debug/g' > apf_cloud9_debug.apr; rm apf_cloud9_debug2.apr
cd node_modules/packager; node package.js projects/apf_cloud9_debug.apr
cd node_modules/packager; cat build/apf_debug.js | sed 's/\(\/\*FILEHEAD(\).*\/apf\/\(.*\)/\1\2/g' > ../../plugins-client/lib.apf/www/apf-packaged/apf_debug.js

# package_apf--temporary fix for non-workering infra
pack_apf:
mkdir -p build/src
mv plugins-client/lib.apf/www/apf-packaged/apf_release.js build/src/apf_release.js
node build/r.js -o name=./build/src/apf_release.js out=./plugins-client/lib.apf/www/apf-packaged/apf_release.js baseUrl=.

# makes ace; at the moment, requires [email protected]
ace:
cd node_modules/ace; make clean pre_build; ./Makefile.dryice.js minimal
Expand Down Expand Up @@ -101,7 +83,7 @@ gzip:
gzip -9 -v -q -f $$i ; \
done

core: apf ace core worker mode theme
core: ace core worker mode theme

package_clean: helper_clean core ext

Expand Down
6 changes: 3 additions & 3 deletions build/app.build.tmpl.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"text" : "%b/text", // plugin for pulling in text! files
"core" : "empty:",
"ext/commands" : "%d/ext.commands",
"apf" : "empty:",
"ppc" : "empty:",
"treehugger" : "empty:",
"debug": "empty:",
"engine.io": "empty:",
Expand All @@ -17,13 +17,13 @@
"events-amd": "empty:",
"msgpack-js": "empty:",
"v8debug": "empty:",
"apf/elements": "%d/lib.apf/www/apf/elements",
"ppc/elements": "%d/lib.ppc/www/ppc/elements",
"ace": "%a",
"%m"
},

include: ["%b/src/core.packed",
"apf/elements/codeeditor",
"ppc/elements/codeeditor",
"ext/commands/commands",
"ext/uploadfiles/uploadfiles",
"%s"],
Expand Down
4 changes: 2 additions & 2 deletions build/core.build.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"treehugger" : "node_modules/treehugger/lib/treehugger",
"v8debug": "node_modules/v8debug/lib/v8debug",
"ext/main": "plugins-client/ext.main",
"apf-packaged": "plugins-client/lib.apf/www/apf-packaged",
"ppc": "plugins-client/lib.ppc/www/ppc",

// Needed because `r.js` has a bug based on packages config below:
// `Error evaluating module "undefined" at location "~/pyloninfra/node_modules/cloud9/events-amd.js"`
Expand Down Expand Up @@ -62,7 +62,7 @@
"node_modules/ace/build/src/theme-tomorrow_night_eighties",
"node_modules/ace/build/src/theme-twilight",
"node_modules/ace/build/src/theme-vibrant_ink",
"apf-packaged/apf_release",
"ppc/ppc",
"core/document",
"core/ext",
"core/ide",
Expand Down
2 changes: 1 addition & 1 deletion configs/packed.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins = plugins.filter(function(plugin) {
// returns false if any of these plugins are detected; lib.packed will emit them
return !(/\/plugins-client\/pylon.core$/.test(plugin) ||
/\/plugins-client\/lib.ace$/.test(plugin) ||
/\/plugins-client\/lib.apf$/.test(plugin) ||
/\/plugins-client\/lib.ppc$/.test(plugin) ||
/\/plugins-client\/lib.treehugger$/.test(plugin) ||
/\/plugins-client\/lib.v8debug$/.test(plugin))
});
Expand Down
4 changes: 2 additions & 2 deletions doc/ext.extension_template/extension_template.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ module.exports = ext.register("ext/extension_template/extension_template", {
});

this.nodes.push(
menus.addItemByPath("Edit/Extension Template", new apf.item({
menus.addItemByPath("Edit/Extension Template", new ppc.item({
command : "sayhello"
}), 5400)
);

/* Just a plain menu...
this.nodes.push(
menus.addItemByPath("Edit/Extension Template", new apf.item({
menus.addItemByPath("Edit/Extension Template", new ppc.item({
onclick : function(){
_self.winExtensionTemplate.show();
}
Expand Down
10 changes: 5 additions & 5 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ for (var p = 2; p < process.argv.length; p++) {
if (process.argv[p] === "-d") {
debug = true;

// apf debug doesn't exist, or it's older than three days--rebuild it
if(!exists("plugins-client/lib.apf/www/apf-packaged/apf_debug.js") ||
(exists("plugins-client/lib.apf/www/apf-packaged/apf_debug.js")) &&
((new Date() - fs.statSync("plugins-client/lib.apf/www/apf-packaged/apf_debug.js").mtime.valueOf()) / 86400000) >= 3) {
console.log("Building apfdebug for first run...");
// ppc debug doesn't exist, or it's older than three days--rebuild it (FIXME)
if(!exists("plugins-client/lib.ppc/www/ppc/ppc_debug.js") ||
(exists("plugins-client/lib.ppc/www/ppc/ppc_debug.js")) &&
((new Date() - fs.statSync("plugins-client/lib.ppc/www/ppc/ppc_debug.js").mtime.valueOf()) / 86400000) >= 3) {
console.log("Building ppcdebug for first run...");

var buildDebug = spawn("npm", ["run-script", "build-debug"]);

Expand Down

0 comments on commit 37dbb66

Please sign in to comment.