[geany/geany-osx] c7ef62: Explicitly use GTK 2 or GTK 3 in config files and scripts

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Sun, 15 Oct 2017 20:56:12 UTC
Commit:      c7ef6244a5da3100097cc606036cbbd68085de08
             https://github.com/geany/geany-osx/commit/c7ef6244a5da3100097cc606036cbbd68085de08

Log Message:
-----------
Explicitly use GTK 2 or GTK 3 in config files and scripts

to make it clear what is related to GTK 2 and what to GTK 3.


Modified Paths:
--------------
    README.md
    geany-gtk2.bundle
    geany.modules
    launcher-gtk2.sh

Modified: README.md
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -127,13 +127,13 @@ Geany Installation
 2.	Inside the geany-osx directory run either 
 
 	```
-	jhbuild -m geany.modules build geany-bundle-release
+	jhbuild -m geany.modules build geany-bundle-release-gtk2
 	```
 
 	or
 
 	```
-	jhbuild -m geany.modules build geany-bundle
+	jhbuild -m geany.modules build geany-bundle-gtk2
 	```
 
 	to build Geany either from release tarballs or git master.
@@ -177,7 +177,7 @@ Bundling
 5.	Create the app bundle by calling
 
 	```
-	gtk-mac-bundler geany.bundle
+	gtk-mac-bundler geany-gtk2.bundle
 	```
 
 	from within the geany-osx directory.


Modified: geany-gtk2.bundle
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -33,7 +33,7 @@
          not needed. If the source path is left out, the default
          script will be used.
     -->
-    <launcher-script>${project}/launcher.sh</launcher-script >
+    <launcher-script>${project}/launcher-gtk2.sh</launcher-script >
 
     <!-- Not implemented: Optional runtime, could be python or mono
          for example.


Modified: geany.modules
54 lines changed, 27 insertions(+), 27 deletions(-)
===================================================================
@@ -100,7 +100,7 @@
             module="gtk-mac-bundler"/>
   </autotools>
 
-  <metamodule id="geany-deps">
+  <metamodule id="geany-deps-gtk2">
     <dependencies>
       <dep package="vte28" />
       <dep package="docutils" />
@@ -123,14 +123,14 @@
     </dependencies>
   </metamodule>
 
-  <!-- Geany -->
-  <autotools id="geany"
+  <!-- Geany GTK 2 -->
+  <autotools id="geany-gtk2"
              autogenargs="--enable-mac-integration">
     <branch repo="github.com"
             module="geany/geany.git"    
             revision="master" />
     <dependencies>
-      <dep package="geany-deps" />
+      <dep package="geany-deps-gtk2" />
     </dependencies>
   </autotools>
 
@@ -145,14 +145,14 @@
     </dependencies>
   </autotools>
 
-  <!-- Geany tarball release -->
-  <autotools id="geany-release"
+  <!-- Geany tarball release GTK 2 -->
+  <autotools id="geany-release-gtk2"
              autogenargs="--enable-mac-integration">
     <branch repo="download.geany.org"
             module="geany-1.31.tar.bz2" 
             version="1.31"/>
     <dependencies>
-      <dep package="geany-deps" />
+      <dep package="geany-deps-gtk2" />
     </dependencies>
   </autotools>
 
@@ -167,8 +167,8 @@
     </dependencies>
   </autotools>
 
-  <!-- Geany-plugins dependencies -->
-  <metamodule id="geany-plugins-deps">
+  <!-- Geany-plugins dependencies GTK 2 -->
+  <metamodule id="geany-plugins-deps-gtk2">
     <dependencies>
       <dep package="vala" />
       <dep package="libgit2" />
@@ -177,14 +177,14 @@
     </dependencies>
   </metamodule>
 
-  <!-- Geany-plugins -->
-  <autotools id="geany-plugins">
+  <!-- Geany-plugins GTK 2 -->
+  <autotools id="geany-plugins-gtk2">
     <branch repo="github.com"
             module="geany/geany-plugins.git"
             revision="master" />
     <dependencies>
-      <dep package="geany" />
-      <dep package="geany-plugins-deps" />
+      <dep package="geany-gtk2" />
+      <dep package="geany-plugins-deps-gtk2" />
     </dependencies>
   </autotools>
 
@@ -195,18 +195,18 @@
             revision="master" />
     <dependencies>
       <dep package="geany-gtk3" />
-      <dep package="geany-plugins-deps" />
+      <dep package="geany-plugins-deps-gtk3" />
     </dependencies>
   </autotools>
 
-  <!-- Geany-plugins tarball release -->
-  <autotools id="geany-plugins-release">
+  <!-- Geany-plugins tarball release GTK 2 -->
+  <autotools id="geany-plugins-release-gtk2">
     <branch repo="download.geany.org"
             module="geany-plugins/geany-plugins-1.31.tar.bz2" 
             version="1.31"/>
     <dependencies>
-      <dep package="geany-release" />
-      <dep package="geany-plugins-deps" />
+      <dep package="geany-release-gtk2" />
+      <dep package="geany-plugins-deps-gtk2" />
     </dependencies>
   </autotools>
 
@@ -217,15 +217,15 @@
             version="1.31"/>
     <dependencies>
       <dep package="geany-release-gtk3" />
-      <dep package="geany-plugins-deps" />
+      <dep package="geany-plugins-deps-gtk3" />
     </dependencies>
   </autotools>
 
-  <!-- Build everything necessary for Geany bundle -->
-  <metamodule id="geany-bundle">
+  <!-- Build everything necessary for Geany bundle GTK 2 -->
+  <metamodule id="geany-bundle-gtk2">
     <dependencies>
-      <dep package="geany" />
-      <dep package="geany-plugins" />
+      <dep package="geany-gtk2" />
+      <dep package="geany-plugins-gtk2" />
     </dependencies>
   </metamodule>
 
@@ -237,11 +237,11 @@
     </dependencies>
   </metamodule>
 
-  <!-- Build everything necessary for Geany bundle from release tarballs -->
-  <metamodule id="geany-bundle-release">
+  <!-- Build everything necessary for Geany bundle from release tarballs GTK 2 -->
+  <metamodule id="geany-bundle-release-gtk2">
     <dependencies>
-      <dep package="geany-release" />
-      <dep package="geany-plugins-release" />
+      <dep package="geany-release-gtk2" />
+      <dep package="geany-plugins-release-gtk2" />
     </dependencies>
   </metamodule>
 


Modified: launcher-gtk2.sh
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).