removed OPTION_FALLBACK and PKG_DEFAULT_ENTRYPOINT

This commit is contained in:
Igor Klopov 2017-10-08 17:08:34 +03:00
parent 12a70c1fbb
commit 9fc773c93b
5 changed files with 15 additions and 79 deletions

View File

@ -328,7 +328,7 @@
TryCatch& try_catch) {
--- node/src/node_main.cc
+++ node/src/node_main.cc
@@ -19,10 +19,279 @@
@@ -19,10 +19,263 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.
@ -566,19 +566,8 @@
+}
+
+
+const char* OPTION_FALLBACK = "--pkg-fallback";
+
+
+int reorder(int argc, char** argv) {
+ int i;
+ int fallback_pos = -1;
+ for (i = 1; i < argc; i++) {
+ if (i > 1) break; // it must be first
+ if (strcmp(argv[i], OPTION_FALLBACK) == 0) {
+ fallback_pos = i;
+ break;
+ }
+ }
+ char** nargv = new char*[argc + 64];
+ char* bakery = ReadOverlays();
+ int c = 0;
@ -591,13 +580,8 @@
+ bakery += width + 1;
+ }
+ }
+ if (fallback_pos == -1) {
+ nargv[c++] = "PKG_DEFAULT_ENTRYPOINT";
+ }
+ for (i = 1; i < argc; i++) {
+ if (i != fallback_pos) {
+ nargv[c++] = argv[i];
+ }
+ nargv[c++] = argv[i];
+ }
+ return adjacent(c, nargv);
+}
@ -608,7 +592,7 @@
// Convert argv to to UTF8
char** argv = new char*[argc];
for (int i = 0; i < argc; i++) {
@@ -55,13 +324,13 @@
@@ -55,13 +308,13 @@
fprintf(stderr, "Could not convert arguments to utf8.");
exit(1);
}

View File

@ -84,7 +84,7 @@
static unsigned supported_;
--- node/deps/v8/src/parser.cc
+++ node/deps/v8/src/parser.cc
@@ -5640,10 +5640,11 @@
@@ -5636,10 +5636,11 @@
return false;
}
@ -409,7 +409,7 @@
--- node/src/node_main.cc
+++ node/src/node_main.cc
@@ -1,7 +1,276 @@
@@ -1,7 +1,260 @@
#include "node.h"
+#include <string.h>
@ -644,19 +644,8 @@
+}
+
+
+const char* OPTION_FALLBACK = "--pkg-fallback";
+
+
+int reorder(int argc, char** argv) {
+ int i;
+ int fallback_pos = -1;
+ for (i = 1; i < argc; i++) {
+ if (i > 1) break; // it must be first
+ if (strcmp(argv[i], OPTION_FALLBACK) == 0) {
+ fallback_pos = i;
+ break;
+ }
+ }
+ char** nargv = new char*[argc + 64];
+ char* bakery = ReadOverlays();
+ int c = 0;
@ -669,13 +658,8 @@
+ bakery += width + 1;
+ }
+ }
+ if (fallback_pos == -1) {
+ nargv[c++] = "PKG_DEFAULT_ENTRYPOINT";
+ }
+ for (i = 1; i < argc; i++) {
+ if (i != fallback_pos) {
+ nargv[c++] = argv[i];
+ }
+ nargv[c++] = argv[i];
+ }
+ return adjacent(c, nargv);
+}
@ -686,7 +670,7 @@
// Convert argv to to UTF8
char** argv = new char*[argc + 1];
for (int i = 0; i < argc; i++) {
@@ -35,17 +304,17 @@
@@ -35,17 +288,17 @@
exit(1);
}
}

View File

@ -431,7 +431,7 @@
if (!options->IsObject()) {
--- node/src/node_main.cc
+++ node/src/node_main.cc
@@ -1,7 +1,276 @@
@@ -1,7 +1,260 @@
#include "node.h"
+#include <string.h>
@ -666,19 +666,8 @@
+}
+
+
+const char* OPTION_FALLBACK = "--pkg-fallback";
+
+
+int reorder(int argc, char** argv) {
+ int i;
+ int fallback_pos = -1;
+ for (i = 1; i < argc; i++) {
+ if (i > 1) break; // it must be first
+ if (strcmp(argv[i], OPTION_FALLBACK) == 0) {
+ fallback_pos = i;
+ break;
+ }
+ }
+ char** nargv = new char*[argc + 64];
+ char* bakery = ReadOverlays();
+ int c = 0;
@ -691,13 +680,8 @@
+ bakery += width + 1;
+ }
+ }
+ if (fallback_pos == -1) {
+ nargv[c++] = "PKG_DEFAULT_ENTRYPOINT";
+ }
+ for (i = 1; i < argc; i++) {
+ if (i != fallback_pos) {
+ nargv[c++] = argv[i];
+ }
+ nargv[c++] = argv[i];
+ }
+ return adjacent(c, nargv);
+}
@ -708,7 +692,7 @@
int wmain(int argc, wchar_t *wargv[]) {
if (!IsWindows7OrGreater()) {
@@ -43,17 +312,17 @@
@@ -43,17 +296,17 @@
exit(1);
}
}

View File

@ -464,7 +464,7 @@
auto pos = option.find("=");
--- node/src/node_main.cc
+++ node/src/node_main.cc
@@ -20,10 +20,279 @@
@@ -20,10 +20,263 @@
// USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "node.h"
@ -702,19 +702,8 @@
+}
+
+
+const char* OPTION_FALLBACK = "--pkg-fallback";
+
+
+int reorder(int argc, char** argv) {
+ int i;
+ int fallback_pos = -1;
+ for (i = 1; i < argc; i++) {
+ if (i > 1) break; // it must be first
+ if (strcmp(argv[i], OPTION_FALLBACK) == 0) {
+ fallback_pos = i;
+ break;
+ }
+ }
+ char** nargv = new char*[argc + 64];
+ char* bakery = ReadOverlays();
+ int c = 0;
@ -727,13 +716,8 @@
+ bakery += width + 1;
+ }
+ }
+ if (fallback_pos == -1) {
+ nargv[c++] = "PKG_DEFAULT_ENTRYPOINT";
+ }
+ for (i = 1; i < argc; i++) {
+ if (i != fallback_pos) {
+ nargv[c++] = argv[i];
+ }
+ nargv[c++] = argv[i];
+ }
+ return adjacent(c, nargv);
+}
@ -744,7 +728,7 @@
#include <VersionHelpers.h>
#include <WinError.h>
@@ -67,11 +336,11 @@
@@ -67,11 +320,11 @@
exit(1);
}
}
@ -757,7 +741,7 @@
// UNIX
#ifdef __linux__
#include <elf.h>
@@ -101,8 +370,8 @@
@@ -101,8 +354,8 @@
#endif
// Disable stdio buffering, it interacts poorly with printf()
// calls elsewhere in the program (e.g., any logging from V8.)

View File

@ -10,7 +10,7 @@
"backport.PR4777.for.N4.patch",
"backport.PR5159.for.N4.patch",
"backport.PR5343.for.N4.patch",
"node.v4.8.3.patch"
"node.v4.8.4.patch"
],
"v0.12.18": [
"backport.R00000.patch",