Title: [161561] trunk/Source/WebKit2
Revision
161561
Author
[email protected]
Date
2014-01-09 10:34:57 -0800 (Thu, 09 Jan 2014)

Log Message

Revert back to using the -n option when producing symbolic links to the GTK-specific
API directories under Source/WebKit2/. Removing the option in r161497 resulted in
recursive links being created under those directories since the links were dereferenced.

To actually ensure that the link is created anew, remove it so it is reconstructed.

Rubber-stamped by Carlos Garcia Campos.

* GNUmakefile.am:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (161560 => 161561)


--- trunk/Source/WebKit2/ChangeLog	2014-01-09 18:31:03 UTC (rev 161560)
+++ trunk/Source/WebKit2/ChangeLog	2014-01-09 18:34:57 UTC (rev 161561)
@@ -1,3 +1,15 @@
+2014-01-09  Zan Dobersek  <[email protected]>
+
+        Revert back to using the -n option when producing symbolic links to the GTK-specific
+        API directories under Source/WebKit2/. Removing the option in r161497 resulted in
+        recursive links being created under those directories since the links were dereferenced.
+
+        To actually ensure that the link is created anew, remove it so it is reconstructed.
+
+        Rubber-stamped by Carlos Garcia Campos.
+
+        * GNUmakefile.am:
+
 2014-01-09  Carlos Garcia Campos  <[email protected]>
 
         Crash when starting a download before the network process has been launched

Modified: trunk/Source/WebKit2/GNUmakefile.am (161560 => 161561)


--- trunk/Source/WebKit2/GNUmakefile.am	2014-01-09 18:31:03 UTC (rev 161560)
+++ trunk/Source/WebKit2/GNUmakefile.am	2014-01-09 18:34:57 UTC (rev 161561)
@@ -397,11 +397,13 @@
 
 $(GENSOURCES_WEBKIT2)/webkit2gtk/include/webkit2: $(webkit2gtk_h_api)
 	$(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/include \
-	&& ln -s -f ${shell pwd}/$(WebKit2)/UIProcess/API/gtk $@
+	&& rm -f $@ \
+	&& ln -n -s -f ${shell pwd}/$(WebKit2)/UIProcess/API/gtk $@
 
 $(GENSOURCES_WEBKIT2)/webkit2extension/include/webkit2: $(webkit2gtk_h_api)
 	$(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2extension/include \
-	&& ln -s -f ${shell pwd}/$(WebKit2)/WebProcess/InjectedBundle/API/gtk $@
+	&& rm -f $@ \
+	&& ln -n -s -f ${shell pwd}/$(WebKit2)/WebProcess/InjectedBundle/API/gtk $@
 
 BUILT_SOURCES += \
 	$(GENSOURCES_WEBKIT2)/webkit2extension/include/webkit2 \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to