Hello,
I've just remembered about the patch which should fix makefile test
target by Yulia on Mac OS X. I've done a little investigation and I've
found out that there probably isn't any way how to deal with it
without using any external tool like which is, but fortunately it
seems [1] that which should exist on all Mac's because it's most
likely to be also shell's builtin. Other possibility which comes to my
mind is trying to remove some test file created before but IMHO it's
strange idea.
So I've added necessary #ifdefs so it should work everywhere (OK
windows is still failing, but I've patches for it which I don't want
put into the trunk before 0.8 release). Can someone with OS X test it?
[1]
http://developer.apple.com/documentation/Darwin/Reference/Manpages/man1/which.1.html
Index:
/home/lukas/DEBUG/hugin/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp
===================================================================
---
/home/lukas/DEBUG/hugin/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp
(revision
3917)
+++
/home/lukas/DEBUG/hugin/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp
(working
copy)
@@ -763,7 +763,11 @@
<< "\...@-$(EXIFTOOL) -ver > " << NULL_DEVICE << " 2>&1 &&
echo '[OK]' || echo '[FAIL]'" << endl;
// test rm
o << "\...@echo -n 'Checking rm...'" << endl
+#ifdef MAC_OS_X
+ << "\...@-which $(RM) > " << NULL_DEVICE << " 2>&1 && echo
'[OK]' || echo '[FAIL]'" << endl;
+#else
<< "\...@-$(RM) --version > " << NULL_DEVICE << " 2>&1 &&
echo '[OK]' || echo '[FAIL]'" << endl;
+#endif
o << endl;
// ==============================
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"hugin and other free panoramic software" group.
A list of frequently asked questions is available at:
http://wiki.panotools.org/Hugin_FAQ
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at http://groups.google.com/group/hugin-ptx
-~----------~----~----~----~------~----~------~--~---
Index: /home/lukas/DEBUG/hugin/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp
===================================================================
--- /home/lukas/DEBUG/hugin/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp (revision 3917)
+++ /home/lukas/DEBUG/hugin/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp (working copy)
@@ -763,7 +763,11 @@
<< "\...@-$(EXIFTOOL) -ver > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl;
// test rm
o << "\...@echo -n 'Checking rm...'" << endl
+#ifdef MAC_OS_X
+ << "\...@-which $(RM) > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl;
+#else
<< "\...@-$(RM) --version > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl;
+#endif
o << endl;
// ==============================
