[Bug 767096] Build script gstreamer-1.0.mk (android) does not work properly on OSX

[GStreamer (GNOME Bugzilla)]

https://bugzilla.gnome.org/show_bug.cgi?id=767096

Sebastian Dröge (slomo) <slomo at coaxion.net> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
 Attachment #328863|none                        |reviewed
             status|                            |

--- Comment #1 from Sebastian Dröge (slomo) <slomo at coaxion.net> ---
Review of attachment 328863:
 --> (https://bugzilla.gnome.org/review?bug=767096&attachment=328863)

Generally looks good but can be cleaned up a little bit :) Thanks!

::: data/ndk-build/gstreamer-1.0.mk
@@ +216,3 @@
+    mv $(PRIV_C).tmp $(PRIV_C)
+    cat $(PRIV_C) | $(SED) "s/@G_IO_MODULES_DECLARE@/$(PRIV_G_R)/g" >
$(PRIV_C).tmp
+    mv $(PRIV_C).tmp $(PRIV_C)

Looks good but you can do all these replacements in one go:

cat orig | sed | sed | sed > tmp
mv tmp orig

@@ +260,3 @@
 else
+    cat $(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer/GStreamer.java |
$(SED) "s;@INCLUDE_COPY_FILE@;//;g" >
$(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer/GStreamer.java.tmp
+    mv $(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer/GStreamer.java.tmp
$(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer/GStreamer.java

Also all these if you move the ifs outside the sed and e.g. do

ifneq ...
INCLUDE_COPY_FILE_SUBST=
else
INCLUDE_COPY_FILE_SUBST=//
endif

cat orig | sed | ... | sed 's;@INCLUDE_COPY_FILE@;$(INCLUDE_COPY_FILE_SUBST);g'
> tmp
mv tmp orig

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are the assignee for the bug.