Remove .travis.yml from branch

.travis.yml

@@ -1,29 +0,0 @@
-language: c
-compiler:
-  - gcc
-  - clang
-# Change this to your needs
-script:
-  - ./autogen.sh
-  - ./configure && make -j4 && make check -j4
-  - ./configure --enable-runtime=libicu --enable-builtin=libicu && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libicu --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libicu --enable-builtin=libidn && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libicu --disable-builtin && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn2 --enable-builtin=libicu && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn2 --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn2 --enable-builtin=libidn && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn2 --disable-builtin && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn --enable-builtin=libicu && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn --enable-builtin=libidn && make clean && make -j4 && make check -j4
-  - ./configure --enable-runtime=libidn --disable-builtin && make clean && make -j4 && make check -j4
-  - ./configure --disable-runtime --enable-builtin=libicu && make clean && make -j4 && make check -j4
-  - ./configure --disable-runtime --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
-  - ./configure --disable-runtime --enable-builtin=libidn && make clean && make -j4 && make check -j4
-  - ./configure --disable-runtime --disable-builtin && make clean && make -j4 && make check -j4
-  - ./configure --enable-gtk-doc && make -j4 && make check -j4
-  - make distcheck
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get -q install autoconf automake autopoint libtool gtk-doc-tools gettext libidn11 libidn11-dev libidn2-0 libidn2-0-dev libicu48 libicu-dev libunistring0 libunistring-dev

src/psl2c.c

@@ -161,6 +161,36 @@ static void _print_psl_entries(FILE *fpout, const _psl_vector_t *v, const char *
 	fprintf(fpout, "};\n");
 }
 
+static void _print_psl_entries_dafsa(FILE *fpout, const _psl_vector_t *v, const char *varname)
+{
+	int it;
+
+#ifdef BUILTIN_GENERATOR_LIBICU
+	do {
+		UVersionInfo version_info;
+		char version[U_MAX_VERSION_STRING_LENGTH];
+
+		u_getVersion(version_info);
+		u_versionToString(version_info, version);
+		fprintf(fpout, "/* automatically generated by psl2c (punycode generated with libicu/%s) */\n", version);
+	} while (0);
+#elif defined(BUILTIN_GENERATOR_LIBIDN2)
+		fprintf(fpout, "/* automatically generated by psl2c (punycode generated with libidn2/%s) */\n", idn2_check_version(NULL));
+#elif defined(BUILTIN_GENERATOR_LIBIDN)
+		fprintf(fpout, "/* automatically generated by psl2c (punycode generated with libidn/%s) */\n", stringprep_check_version(NULL));
+#else
+	fprintf(fpout, "/* automatically generated by psl2c (without punycode support) */\n");
+#endif
+
+	for (it = 0; it < v->cur; it++) {
+		_psl_entry_t *e = _vector_get(v, it);
+
+
+		fprintf(fpout, "\t{ \"%s\", NULL, %hd, %d, %d },\n",
+			e->label_buf, e->length, (int) e->nlabels, (int) e->flags);
+	}
+}
+
 #if 0
 #if !defined(WITH_LIBICU) && !defined(WITH_IDN2)
 static int _str_needs_encoding(const char *s)
@@ -213,17 +243,22 @@ int main(int argc, const char **argv)
 #ifdef _GENERATE_BUILTIN_DATA
 	psl_ctx_t *psl;
 #endif
-	int ret = 0;
+	int ret = 0, argpos = 1, dafsa = 0;
 
-	if (argc != 3) {
+	if (argc == 4 && !strcmp(argv[1], "--dafsa")) {
-		fprintf(stderr, "Usage: psl2c <infile> <outfile>\n");
+		argpos = 2;
+		dafsa = 1;
+	}
+
+	if (argc - argpos != 2) {
+		fprintf(stderr, "Usage: psl2c [--dafsa] <infile> <outfile>\n");
 		fprintf(stderr, "  <infile>  is the 'public_suffix_list.dat', lowercase UTF-8 encoded\n");
 		fprintf(stderr, "  <outfile> is the the C filename to be generated from <infile>\n");
 		return 1;
 	}
 
 #ifdef _GENERATE_BUILTIN_DATA
-	if (!(psl = psl_load_file(argv[1])))
+	if (!(psl = psl_load_file(argv[argpos])))
 		return 2;
 
 	/* look for ambigious or double entries */
@@ -245,7 +280,10 @@ int main(int argc, const char **argv)
 		_add_punycode_if_needed(psl->suffixes);
 #endif
 
-		_print_psl_entries(fpout, psl->suffixes, "suffixes");
+		if (dafsa)
+			_print_psl_entries(fpout, psl->suffixes, "suffixes");
+		else
+			_print_psl_entries_dafsa(fpout, psl->suffixes, "suffixes_dafsa");
 
 		snprintf(cmd, cmdsize, "sha1sum %s", argv[1]);
 		if ((pp = popen(cmd, "r"))) {