Commit debian/0.10 - maven-debian-helper

Add --non-interactive option to mh_lspoms and use it in maven.mk to avoid asking questions during a build (Closes: #574399) Ludovic Claude 14 years ago

4 changed file(s) with 18 addition(s) and 5 deletion(s). Raw diff Collapse all Expand all

-3

bin/mh_lspoms less more

13	13	echo -e "Options:"
14	14	echo -e "\t-h --help: show this text"
15	15	echo -e "\t-V --version: show the version"
16		echo -e "\t-p<package> --package=<package>: package to act on "
	16	echo -e "\t-p<package> --package=<package>: package to act on"
17	17	echo -e "\t-f --force: force run even if the .poms files exist."
18	18	echo -e "\t Only maven.rules will be created, assuming that it"
19	19	echo -e "\t did not exist before."
	20	echo -e "\t-n --non-interactive: non interactive session, don't ask questions."
20	21	echo -e ""
21	22	echo -e "You need to execute it on the unpacked origial source tree, merged with the"
22	23	echo -e "debian/ folder. It will create the file debian/<binary package>.poms which"

31	32	exit 1
32	33	}
33	34
34		ARGS="p package f force" parseargs "$@"
	35	ARGS="p package f force n non-interactive" parseargs "$@"
35	36
36	37	PACKAGE=$(getarg p package)
37	38	FORCE=$(getarg f force)
	39	NON_INTERACTIVE=$(getarg n non-interactive)
38	40
39	41	if [ -z "$PACKAGE" ]; then
40	42	if [ "$ARGC" -gt "0" ]; then

48	50	echo "debian/$PACKAGE.poms already exist. Please delete it if you want to regenerate it."
49	51	else
50	52	mkdir -p debian
51		java -cp /usr/share/java/maven-project.jar:/usr/share/java/maven-repo-helper.jar:/usr/share/java/maven-packager-utils.jar org.debian.maven.packager.DependenciesSolver --package=$PACKAGE --maven-repo=/usr/share/maven-repo
	53	java -cp /usr/share/java/maven-project.jar:/usr/share/java/maven-repo-helper.jar:/usr/share/java/maven-packager-utils.jar org.debian.maven.packager.DependenciesSolver ${NON_INTERACTIVE:+--non-interactive} --package=$PACKAGE --maven-repo=/usr/share/maven-repo
52	54	rm debian/$PACKAGE.substvars
53	55	echo "The list of POM files is now in debian/$PACKAGE.poms"
54	56	fi

-0

debian/changelog less more

	0	maven-debian-helper (0.10) unstable; urgency=low
	1
	2	* Add --non-interactive option to mh_lspoms and use it
	3	in maven.mk to avoid asking questions during a build
	4	(Closes: #574399)
	5
	6	-- Ludovic Claude <ludovic.claude@laposte.net> Wed, 24 Mar 2010 23:48:29 +0100
	7
0	8	maven-debian-helper (0.9) unstable; urgency=low
1	9
2	10	* maven-vars.mk: Fix detection of DEB_DOC_PACKAGE

-0

maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java less more

878	878	System.out.println(" --ant: use ant for the packaging");
879	879	System.out.println(" --run-tests: run the unit tests");
880	880	System.out.println(" --generate-javadoc: generate Javadoc");
	881	System.out.println(" --non-interactive: non interactive session");
881	882	return;
882	883	}
883	884	DependenciesSolver solver = new DependenciesSolver();

904	905	solver.setRunTests(true);
905	906	} else if (arg.equals("--generate-javadoc")) {
906	907	solver.setGenerateJavadoc(true);
	908	} else if (arg.equals("--non-interactive")) {
	909	solver.setNonInteractive(true);
907	910	}
908	911	i = inc(i, args);
909	912	}

-2

share/cdbs/1/class/maven.mk less more

51	51	fi
52	52
53	53	debian/$(DEB_JAR_PACKAGE).poms:
54		mh_lspoms -p$(DEB_JAR_PACKAGE)
	54	mh_lspoms --non-interactive -p$(DEB_JAR_PACKAGE)
55	55
56	56	debian/maven.rules:
57		mh_lspoms -p$(DEB_JAR_PACKAGE) --force
	57	mh_lspoms --non-interactive -p$(DEB_JAR_PACKAGE) --force
58	58
59	59	ifeq (, $(DEB_DOC_PACKAGE))
60	60	DEB_PATCHPOMS_ARGS += --build-no-docs