Moritz Lenz schrieb:
Reini Urban wrote:
Attached are updates to the cygwin070patches branch.
Thanks for applying the patches!
applied as r30543.
And this one also please.
fix cuddled else and some beautification.
--
Reini Urban
http://phpwiki.org/ http://murbreak.at/
Index: src/library.c
===================================================================
--- src/library.c (revision 30543)
+++ src/library.c (working copy)
@@ -168,7 +168,8 @@
entry = CONST_STRING(interp, "lib/parrot/");
VTABLE_push_string(interp, paths, entry);
#ifdef ENABLE_PARROT_LIBRARY_INSTALLED
- } else {
+ }
+ else {
#endif
entry = CONST_STRING(interp, "runtime/parrot/include/");
VTABLE_push_string(interp, paths, entry);
@@ -192,7 +193,8 @@
entry = CONST_STRING(interp, "lib/parrot/");
VTABLE_push_string(interp, paths, entry);
#ifdef ENABLE_PARROT_LIBRARY_INSTALLED
- } else {
+ }
+ else {
#endif
entry = CONST_STRING(interp, "runtime/parrot/library/");
VTABLE_push_string(interp, paths, entry);
@@ -214,7 +216,8 @@
entry = CONST_STRING(interp, "lib/parrot/dynext/");
VTABLE_push_string(interp, paths, entry);
#ifdef ENABLE_PARROT_LIBRARY_INSTALLED
- } else {
+ }
+ else {
#endif
entry = CONST_STRING(interp, "runtime/parrot/dynext/");
VTABLE_push_string(interp, paths, entry);
Index: config/gen/makefiles/pge.in
===================================================================
--- config/gen/makefiles/pge.in (revision 30543)
+++ config/gen/makefiles/pge.in (working copy)
@@ -8,8 +8,8 @@
TOOL_DIR = ../..
CP = @cp@
RECONFIGURE = $(PERL) @build_dir@/tools/dev/reconfigure.pl
-#+(cygchkdll):SHRPENV = env PATH="@build_dir@/blib/lib:$(PATH)"
-#-(cygchkdll):SHRPENV = env [EMAIL PROTECTED]@/blib/lib
+#+(cygwin):SHRPENV = env PATH="@build_dir@/blib/lib:$(PATH)"
+#-(cygwin):SHRPENV = env [EMAIL PROTECTED]@/blib/lib
# Where to put things
PARROT_LIBRARY = ../../runtime/parrot/library
Index: config/gen/makefiles/tge.in
===================================================================
--- config/gen/makefiles/tge.in (revision 30543)
+++ config/gen/makefiles/tge.in (working copy)
@@ -7,8 +7,8 @@
RM_F = @rm_f@
PARROT = ../../[EMAIL PROTECTED]@
RECONFIGURE = $(PERL) @build_dir@/tools/dev/reconfigure.pl
-#+(cygchkdll):SHRPENV = env PATH="@build_dir@/blib/lib:$(PATH)"
-#-(cygchkdll):SHRPENV = env [EMAIL PROTECTED]@/blib/lib
+#+(cygwin):SHRPENV = env PATH="@build_dir@/blib/lib:$(PATH)"
+#-(cygwin):SHRPENV = env [EMAIL PROTECTED]@/blib/lib
# Where to put things
PARROT_LIBRARY = ../../runtime/parrot/library
Index: config/gen/makefiles/root.in
===================================================================
--- config/gen/makefiles/root.in (revision 30543)
+++ config/gen/makefiles/root.in (working copy)
@@ -107,8 +107,8 @@
INNO_SETUP = iscc
JIT_BUILD_TOOL = $(BUILD_TOOLS_DIR)/jit2c.pl
#+(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@
-#+(cygchkdll):SHRPENV = env PATH="@build_dir@/blib/lib:$(PATH)"
-#-(cygchkdll):SHRPENV = env [EMAIL PROTECTED]@/blib/lib
+#+(cygwin):SHRPENV = env PATH="@build_dir@/blib/lib:$(PATH)"
+#-(cygwin):SHRPENV = env [EMAIL PROTECTED]@/blib/lib
###############################################################################
#
@@ -893,7 +893,7 @@
$(LIBPARROT_SHARED) : $(O_FILES)
$(MKPATH) @blib_dir@
$(LD) $(LD_SHARE_FLAGS) $(LDFLAGS) @[EMAIL PROTECTED]@ @libparrot_soname@ \
-#+(cygchkdll): -Wl,--out-implib=blib/lib/libparrot.dll.a \
+#+(cygwin): -Wl,--out-implib=blib/lib/libparrot.dll.a \
$(O_FILES) $(C_LIBS) $(ICU_SHARED)
#+(win32): if exist [EMAIL PROTECTED] mt.exe -nologo -manifest [EMAIL PROTECTED] -outputresource:$@;2
#+(libparrot_shared_alias): ( cd @blib_dir@ ; ln -sf @libparrot_shared@ @libparrot_shared_alias@ )
Index: config/gen/makefiles/pct.in
===================================================================
--- config/gen/makefiles/pct.in (revision 30543)
+++ config/gen/makefiles/pct.in (working copy)
@@ -10,8 +10,8 @@
TEST_DIR = ../../t/compilers/pct
CP = @cp@
RECONFIGURE = $(PERL) @build_dir@/tools/dev/reconfigure.pl
-#+(cygchkdll):SHRPENV = env PATH="@build_dir@/blib/lib:$(PATH)"
-#-(cygchkdll):SHRPENV = env [EMAIL PROTECTED]@/blib/lib
+#+(cygwin):SHRPENV = env PATH="@build_dir@/blib/lib:$(PATH)"
+#-(cygwin):SHRPENV = env [EMAIL PROTECTED]@/blib/lib
# Where to put things
PARROT_LIBRARY = ../../runtime/parrot/library
Index: config/gen/makefiles/nqp.in
===================================================================
--- config/gen/makefiles/nqp.in (revision 30543)
+++ config/gen/makefiles/nqp.in (working copy)
@@ -5,8 +5,8 @@
RM_F = @rm_f@
PARROT = ../../[EMAIL PROTECTED]@
RECONFIGURE = $(PERL) @build_dir@/tools/dev/reconfigure.pl
-#+(cygchkdll): SHRPENV = env PATH="@build_dir@/blib/lib:$(PATH)"
-#-(cygchkdll): SHRPENV = env [EMAIL PROTECTED]@/blib/lib
+#+(cygwin): SHRPENV = env PATH="@build_dir@/blib/lib:$(PATH)"
+#-(cygwin): SHRPENV = env [EMAIL PROTECTED]@/blib/lib
PARROT_LIBRARY = @build_dir@/runtime/parrot/library
PGE_LIBRARY = @build_dir@/runtime/parrot/library/PGE
Index: config/gen/makefiles/json.in
===================================================================
--- config/gen/makefiles/json.in (revision 30543)
+++ config/gen/makefiles/json.in (working copy)
@@ -4,8 +4,8 @@
RM_F = @rm_f@
PARROT = ../../[EMAIL PROTECTED]@
RECONFIGURE = $(PERL) @build_dir@/tools/dev/reconfigure.pl
-#+(cygchkdll):SHRPENV = env PATH="@build_dir@/blib/lib:$(PATH)"
-#-(cygchkdll):SHRPENV = env [EMAIL PROTECTED]@/blib/lib
+#+(cygwin):SHRPENV = env PATH="@build_dir@/blib/lib:$(PATH)"
+#-(cygwin):SHRPENV = env [EMAIL PROTECTED]@/blib/lib
TOOL_DIR = ../..
PGE_DIR = ../../compilers/pge
