[geany/geany-osx] 8ef13f: Add -release targets to build from release tarballs

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Sun, 15 Nov 2015 20:20:22 UTC
Commit:      8ef13f756793f918bb6fb8819349871bba04bce9
             https://github.com/geany/geany-osx/commit/8ef13f756793f918bb6fb8819349871bba04bce9

Log Message:
-----------
Add -release targets to build from release tarballs


Modified Paths:
--------------
    README.md
    geany.modules

Modified: README.md
15 lines changed, 12 insertions(+), 3 deletions(-)
===================================================================
@@ -111,12 +111,20 @@ Geany Installation
 	export LANG=en_US.UTF-8
 	```
 
-2.	Inside the geany-osx directory run
+2.	Inside the geany-osx directory run either 
+
+	```
+	jhbuild -m geany.modules build geany-bundle-release
+	```
+
+	or
 
 	```
 	jhbuild -m geany.modules build geany-bundle
 	```
 
+	to build Geany either from release tarballs or git master.
+
 	There are other useful module installation options - check the geany.modules
 	file for more options.
 
@@ -206,8 +214,9 @@ have to be performed during normal bundle/installer creation:
 	```
 
 *	Before the release update the Geany version and copyright years inside
-	info.plist and create_dmg.sh. Dependencies inside the geany.modules
-	can also be updated to newer versions. 
+	Info.plist and create_dmg.sh. Also update the `-release` targets in
+	geany.modules file to point to the new release. Dependencies inside
+	geany.modules can also be updated to newer versions.
 
 ---
 


Modified: geany.modules
34 lines changed, 33 insertions(+), 1 deletions(-)
===================================================================
@@ -14,6 +14,8 @@
               href="git://git.gnome.org/"/>
   <repository type="tarball" name="download.github.com"
               href="https://github.com/"/>
+  <repository type="tarball" name="download.geany.org"
+              href="http://download.geany.org/"/>
 
   <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules" />
 
@@ -85,7 +87,7 @@
     </dependencies>
   </metamodule>
 
-  <!-- Geany with bundling dependencies -->
+  <!-- Geany -->
   <autotools id="geany"
              autogenargs="--enable-mac-integration">
     <branch repo="github.com"
@@ -96,6 +98,17 @@
     </dependencies>
   </autotools>
 
+  <!-- Geany tarball release -->
+  <autotools id="geany-release"
+             autogenargs="--enable-mac-integration">
+    <branch repo="download.geany.org"
+            module="geany-1.26.tar.bz2" 
+            version="1.26"/>
+    <dependencies>
+      <dep package="geany-deps" />
+    </dependencies>
+  </autotools>
+
   <!-- Geany-plugins dependencies -->
   <metamodule id="geany-plugins-deps">
     <dependencies>
@@ -117,6 +130,17 @@
     </dependencies>
   </autotools>
 
+  <!-- Geany-plugins tarball release -->
+  <autotools id="geany-plugins-release">
+    <branch repo="download.geany.org"
+            module="geany-plugins/geany-plugins-1.26.tar.bz2" 
+            version="1.26"/>
+    <dependencies>
+      <dep package="geany" />
+      <dep package="geany-plugins-deps" />
+    </dependencies>
+  </autotools>
+
   <!-- Build everything necessary for Geany bundle -->
   <metamodule id="geany-bundle">
     <dependencies>
@@ -125,4 +149,12 @@
     </dependencies>
   </metamodule>
 
+  <!-- Build everything necessary for Geany bundle from release tarballs -->
+  <metamodule id="geany-bundle-release">
+    <dependencies>
+      <dep package="geany-release" />
+      <dep package="geany-plugins-release" />
+    </dependencies>
+  </metamodule>
+
 </moduleset>



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