From bce0e160d8e0d19cf230272570ce607263d670da Mon Sep 17 00:00:00 2001 From: philippe lhardy Date: Sun, 2 Nov 2025 18:10:21 +0100 Subject: [PATCH] don't build build.xml, maintain it manualy remove antify.sh and related builx.xml target makefile Signed-off-by: philippe lhardy --- 4java.makefile | 7 ++-- Makefile.4.java | 12 +++---- WHEREWHAT | 12 ------- antify.sh | 92 ------------------------------------------------- 4 files changed, 6 insertions(+), 117 deletions(-) delete mode 100644 WHEREWHAT delete mode 100755 antify.sh diff --git a/4java.makefile b/4java.makefile index a6b4840..3b52e22 100644 --- a/4java.makefile +++ b/4java.makefile @@ -4,7 +4,7 @@ DISTJAR=$(DISTPREFIX)-$(PROJECT_VERSION).jar JAVAC=javac JAR=jar -all: build.xml dist/lib/$(DISTJAR) +all: dist/lib/$(DISTJAR) getname: @echo dist/lib/$(DISTJAR) @@ -18,9 +18,6 @@ dist: dist/lib/$(DISTJAR): dist ant dist -build.xml: - ./antify.sh >$@ - clean: cd java; make clean rm -f dist/lib/$(DISTPREFIX)*.jar @@ -41,7 +38,7 @@ deb/%: ./debianize.sh create $@ debian/compat: - echo "7" >$@ + echo "10" >$@ debian/%: ./debianize.sh create $@ >$@ diff --git a/Makefile.4.java b/Makefile.4.java index 1916202..4b05d3e 100644 --- a/Makefile.4.java +++ b/Makefile.4.java @@ -6,7 +6,7 @@ JAVAC=javac JAR=jar RHINO_VER=1_7R5 -all: build.xml dist/lib/$(DISTJAR) +all: dist/lib/$(DISTJAR) getname: @echo dist/lib/$(DISTJAR) @@ -17,11 +17,7 @@ dist: dist/lib/$(DISTJAR): dist ant dist -build.xml: - ./antify.sh >$@ - clean: - rm -f build.xml rm -f dist/lib/$(DISTPREFIX)*.jar rm -rf build cd java; make clean @@ -41,13 +37,13 @@ deb/%: ./debianize.sh create $@ debian/compat: - echo "7" >$@ + echo "10" >$@ debian/%: ./debianize.sh create $@ >$@ -deb: debian debian/rules debian/control debian/compat debian/changelog deb/javadoc deb/jlibs - dpkg-buildpackage -uc -us +deb: debian debian/rules debian/control debian/compat debian/changelog deb/javadoc deb/jlibs deb/format + ./buildsourcetree.sh /usr/bin/emacs: sudo apt-get install emacs diff --git a/WHEREWHAT b/WHEREWHAT deleted file mode 100644 index 772e23b..0000000 --- a/WHEREWHAT +++ /dev/null @@ -1,12 +0,0 @@ - -java/ - -java sources - -java/org/artisanlogiciel/games - -java sources for package org.artisanlogiciel.games respect of java directory naming convention of files - -java/org/artisanlogiciel/games/Main.java - -Main Java entry point for this program \ No newline at end of file diff --git a/antify.sh b/antify.sh deleted file mode 100755 index 9afbfd7..0000000 --- a/antify.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash -# -# Generates to stdout an ant project build.xml content using some parameters from project_params -# -# this is used by 4java.makefile for build.xml target - -usage() -{ - head -n 4 $0 -} - -PROJECT_PARAMS=./project_params -if [[ -f $PROJECT_PARAMS ]] -then - source $PROJECT_PARAMS -else - echo "[ERROR] missing $PROJECT_PARAMS " >&2 - usage - exit 1 -fi - -# TODO reuse internal tsamp ${DSTAMP} ( after review i do't recall what is wanted to do here ) - -cat < - - $project_name build - autogenerated build file by $0 script - - - - - - - - - - - - - - - - -EOF - -if [[ -z $java_target ]] -then - echo ' ' -else - echo " " -fi -echo "" -echo " " - -cat < - - - - - - - - - - - - - - - - - - - - -EOF