[svn:parrot] r37362 - in trunk: . examples/pir/befunge examples/pir/befunge/config examples/pir/befunge/config/makefiles
fperrad at svn.parrot.org
fperrad at svn.parrot.org
Thu Mar 12 20:05:38 UTC 2009
Author: fperrad
Date: Thu Mar 12 20:05:37 2009
New Revision: 37362
URL: https://trac.parrot.org/parrot/changeset/37362
Log:
[befunge] re-run mk_language_shell.pl
Added:
trunk/examples/pir/befunge/Configure.pl (contents, props changed)
trunk/examples/pir/befunge/config/
trunk/examples/pir/befunge/config/makefiles/
trunk/examples/pir/befunge/config/makefiles/root.in (contents, props changed)
Deleted:
trunk/examples/pir/befunge/Makefile
Modified:
trunk/MANIFEST
trunk/MANIFEST.SKIP
trunk/examples/pir/befunge/ (props changed)
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST Thu Mar 12 19:48:12 2009 (r37361)
+++ trunk/MANIFEST Thu Mar 12 20:05:37 2009 (r37362)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Thu Mar 12 08:07:48 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Thu Mar 12 19:59:50 2009 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -737,10 +737,11 @@
examples/past/blocktype_immediate.pir [examples]
examples/past/four_plus_one.pir [examples]
examples/pir/befunge/Changes [examples]
+examples/pir/befunge/Configure.pl [examples]
examples/pir/befunge/MAINTAINER [examples]
-examples/pir/befunge/Makefile [examples]
examples/pir/befunge/README []doc
examples/pir/befunge/befunge.pir [examples]
+examples/pir/befunge/config/makefiles/root.in [examples]
examples/pir/befunge/debug.pir [examples]
examples/pir/befunge/flow.pir [examples]
examples/pir/befunge/io.pir [examples]
Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP Thu Mar 12 19:48:12 2009 (r37361)
+++ trunk/MANIFEST.SKIP Thu Mar 12 20:05:37 2009 (r37362)
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Wed Mar 11 20:48:41 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Thu Mar 12 19:59:50 2009 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -280,10 +280,26 @@
^editor/pir\.vim$
^editor/pir\.vim/
# generated from svn:ignore of 'examples/languages/abc/'
+^examples/languages/abc/.*\.c$
+^examples/languages/abc/.*\.c/
+^examples/languages/abc/.*\.exe$
+^examples/languages/abc/.*\.exe/
+^examples/languages/abc/.*\.iss$
+^examples/languages/abc/.*\.iss/
+^examples/languages/abc/.*\.o$
+^examples/languages/abc/.*\.o/
+^examples/languages/abc/.*\.obj$
+^examples/languages/abc/.*\.obj/
^examples/languages/abc/.*\.pbc$
^examples/languages/abc/.*\.pbc/
^examples/languages/abc/Makefile$
^examples/languages/abc/Makefile/
+^examples/languages/abc/abc$
+^examples/languages/abc/abc/
+^examples/languages/abc/installable_abc$
+^examples/languages/abc/installable_abc/
+^examples/languages/abc/man$
+^examples/languages/abc/man/
# generated from svn:ignore of 'examples/languages/abc/src/'
^examples/languages/abc/src/gen_actions\.pir$
^examples/languages/abc/src/gen_actions\.pir/
@@ -303,12 +319,20 @@
^examples/languages/squaak/.*\.exe/
^examples/languages/squaak/.*\.iss$
^examples/languages/squaak/.*\.iss/
+^examples/languages/squaak/.*\.o$
+^examples/languages/squaak/.*\.o/
+^examples/languages/squaak/.*\.obj$
+^examples/languages/squaak/.*\.obj/
^examples/languages/squaak/.*\.pbc$
^examples/languages/squaak/.*\.pbc/
^examples/languages/squaak/Makefile$
^examples/languages/squaak/Makefile/
+^examples/languages/squaak/installable_squaak$
+^examples/languages/squaak/installable_squaak/
^examples/languages/squaak/man$
^examples/languages/squaak/man/
+^examples/languages/squaak/squaak$
+^examples/languages/squaak/squaak/
# generated from svn:ignore of 'examples/languages/squaak/src/'
^examples/languages/squaak/src/gen_.*\.pir$
^examples/languages/squaak/src/gen_.*\.pir/
@@ -328,8 +352,24 @@
^examples/pasm/hello\.pbc$
^examples/pasm/hello\.pbc/
# generated from svn:ignore of 'examples/pir/befunge/'
+^examples/pir/befunge/.*\.c$
+^examples/pir/befunge/.*\.c/
+^examples/pir/befunge/.*\.exe$
+^examples/pir/befunge/.*\.exe/
+^examples/pir/befunge/.*\.iss$
+^examples/pir/befunge/.*\.iss/
+^examples/pir/befunge/.*\.o$
+^examples/pir/befunge/.*\.o/
+^examples/pir/befunge/.*\.obj$
+^examples/pir/befunge/.*\.obj/
^examples/pir/befunge/.*\.pbc$
^examples/pir/befunge/.*\.pbc/
+^examples/pir/befunge/Makefile$
+^examples/pir/befunge/Makefile/
+^examples/pir/befunge/befunge$
+^examples/pir/befunge/befunge/
+^examples/pir/befunge/installable_befunge$
+^examples/pir/befunge/installable_befunge/
# generated from svn:ignore of 'ext/'
^ext/Makefile$
^ext/Makefile/
Added: trunk/examples/pir/befunge/Configure.pl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/examples/pir/befunge/Configure.pl Thu Mar 12 20:05:37 2009 (r37362)
@@ -0,0 +1,31 @@
+# Copyright (C) 2009, Parrot Foundation.
+# $Id$
+
+use strict;
+use warnings;
+use 5.008;
+
+create_makefiles();
+
+sub create_makefiles {
+ my %makefiles = (
+ 'config/makefiles/root.in' => 'Makefile',
+# 'config/makefiles/pmc.in' => 'src/pmc/Makefile',
+# 'config/makefiles/ops.in' => 'src/ops/Makefile',
+ );
+ my $build_tool = '../../../tools/dev/gen_makefile.pl';
+
+ foreach my $template (keys %makefiles) {
+ my $makefile = $makefiles{$template};
+ print "Creating $makefile\n";
+ system('perl', $build_tool, $template, $makefile);
+ }
+}
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
+
Deleted: trunk/examples/pir/befunge/Makefile
==============================================================================
--- trunk/examples/pir/befunge/Makefile Thu Mar 12 20:05:37 2009 (r37361)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,44 +0,0 @@
-# Copyright (C) 2002-2009, Parrot Foundation.
-#
-
-# Setup of some commands
-PARROT = ../../../parrot
-PERL = /usr/bin/perl
-RM_F = $(PERL) -MExtUtils::Command -e rm_f
-
-default: all
-
-help :
- @echo ""
- @echo "Following targets are available for the user:"
- @echo ""
- @echo " build: Create befunge.pbc"
- @echo " This is the default."
- @echo ""
- @echo " test: run the test suite,"
- @echo ""
- @echo " clean: clean up temporary files"
- @echo ""
- @echo " realclean: clean up generated files"
- @echo ""
- @echo " help: print this help message"
-
-all: build
-
-build: befunge.pbc
-
-befunge.pbc: befunge.pir debug.pir flow.pir io.pir load.pir maths.pir stack.pir
- $(PARROT) -o befunge.pbc befunge.pir
-
-test: befunge.pbc
- $(PERL) t/harness
-
-clean:
- $(RM_F) core \
- "*.pbc" \
- "*~"
-
-# Local variables:
-# mode: makefile
-# End:
-# vim: ft=make:
Added: trunk/examples/pir/befunge/config/makefiles/root.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/examples/pir/befunge/config/makefiles/root.in Thu Mar 12 20:05:37 2009 (r37362)
@@ -0,0 +1,149 @@
+## $Id$
+
+## arguments we want to run parrot with
+PARROT_ARGS :=
+
+## configuration settings
+VERSION := @versiondir@
+BIN_DIR := @bin_dir@
+LIB_DIR := @lib_dir@$(VERSION)
+DOC_DIR := @doc_dir@$(VERSION)
+MANDIR := @mandir@$(VERSION)
+
+# Set up extensions
+LOAD_EXT := @load_ext@
+O := @o@
+
+## Setup some commands
+MAKE := @make_c@
+PERL := @perl@
+CAT := @cat@
+CHMOD := @chmod@
+CP := @cp@
+MKPATH := @mkpath@
+RM_F := @rm_f@
+RM_RF := @rm_rf@
+POD2MAN := pod2man
+#IF(parrot_is_shared and not(cygwin or win32)):export LD_RUN_PATH := @blib_dir@:$(LD_RUN_PATH)
+PARROT := @build_dir@/parrot at exe@
+PBC_TO_EXE := @build_dir@/pbc_to_exe at exe@
+#IF(darwin):
+#IF(darwin):# MACOSX_DEPLOYMENT_TARGET must be defined for OS X compilation/linking
+#IF(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@
+
+SOURCES := \
+ befunge.pir \
+ debug.pir \
+ flow.pir \
+ io.pir \
+ load.pir \
+ maths.pir \
+ stack.pir
+
+DOCS := README
+
+BUILD_CLEANUPS := \
+ befunge.pbc \
+ "*.c" \
+ "*$(O)" \
+ befunge at exe@ \
+#IF(win32): parrot-befunge.exe \
+#IF(win32): parrot-befunge.iss \
+#IF(win32): "setup-parrot-*.exe" \
+ installable_befunge at exe@
+
+TEST_CLEANUPS :=
+
+# the default target
+build: befunge.pbc
+
+all: build befunge at exe@ installable
+
+befunge.pbc: $(SOURCES)
+ $(PARROT) $(PARROT_ARGS) -o befunge.pbc befunge.pir
+
+befunge at exe@: befunge.pbc
+ $(PBC_TO_EXE) befunge.pbc
+
+installable: installable_befunge at exe@
+
+installable_befunge at exe@: befunge.pbc
+ $(PBC_TO_EXE) befunge.pbc --install
+
+Makefile: config/makefiles/root.in
+ $(PERL) Configure.pl
+
+# This is a listing of all targets, that are meant to be called by users
+help:
+ @echo ""
+ @echo "Following targets are available for the user:"
+ @echo ""
+ @echo " build: befunge.pbc"
+ @echo " This is the default."
+ @echo " befunge at exe@ Self-hosting binary not to be installed."
+ @echo " all: befunge.pbc befunge at exe@ installable"
+ @echo " installable: Create libs and self-hosting binaries to be installed."
+ @echo " install: Install the installable targets and docs."
+ @echo ""
+ @echo "Testing:"
+ @echo " test: Run the test suite."
+ @echo " test-installable: Test self-hosting targets."
+ @echo " testclean: Clean up test results."
+ @echo ""
+ @echo "Cleaning:"
+ @echo " clean: Basic cleaning up."
+ @echo " realclean: Removes also files generated by 'Configure.pl'"
+ @echo " distclean: Removes also anything built, in theory"
+ @echo ""
+ @echo "Misc:"
+ @echo " help: Print this help message."
+ @echo ""
+
+test: build
+ $(PERL) t/harness
+
+# basic run for missing libs
+test-installable: installable
+ echo "1" | ./installable_befunge at exe@
+
+install: installable
+ $(CP) installable_befunge at exe@ $(BIN_DIR)/parrot-befunge at exe@
+ $(CHMOD) 0755 $(BIN_DIR)/parrot-befunge at exe@
+ -$(MKPATH) $(LIB_DIR)/languages/befunge
+ $(CP) befunge.pbc $(LIB_DIR)/languages/befunge/befunge.pbc
+# -$(MKPATH) $(MANDIR)/man1
+# $(POD2MAN) befunge.pod > $(MANDIR)/man1/parrot-befunge.1
+ -$(MKPATH) $(DOC_DIR)/languages/befunge
+ $(CP) $(DOCS) $(DOC_DIR)/languages/befunge
+
+uninstall:
+ $(RM_F) $(BIN_DIR)/parrot-befunge at exe@
+ $(RM_RF) $(LIB_DIR)/languages/befunge
+# $(RM_F) $(MANDIR)/man1/parrot-befunge.1
+ $(RM_RF) $(DOC_DIR)/languages/befunge
+
+win32-inno-installer: installable
+# -$(MKPATH) man/man1
+# $(POD2MAN) befunge.pod > man/man1/parrot-befunge.1
+# -$(MKPATH) man/html
+# pod2html --infile befunge.pod --outfile man/html/parrot-befunge.html
+ $(CP) installable_befunge at exe@ parrot-befunge.exe
+ $(PERL) -I at build_dir@/lib @build_dir@/tools/dev/mk_inno_language.pl befunge
+ iscc parrot-befunge.iss
+
+testclean:
+ $(RM_F) $(TEST_CLEANUPS)
+
+clean:
+ $(RM_F) $(TEST_CLEANUPS) $(BUILD_CLEANUPS)
+
+realclean:
+ $(RM_F) $(TEST_CLEANUPS) $(BUILD_CLEANUPS) Makefile
+
+distclean: realclean
+
+# Local variables:
+# mode: makefile
+# End:
+# vim: ft=make:
+
More information about the parrot-commits
mailing list