Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Info.plist.patch #1323

Open
wants to merge 7 commits into
base: BRANCH_2_7_X
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@ GanttProject

GanttProject is an open-source desktop project scheduling and management tool. It is written in Java/Swing.

This repository is a mirror of the [main Mercurial repository](https://code.google.com/p/ganttproject/source/browse/) on Google Code Hosting. It is almost always as actual as the main one (may be just a few commits behind). We synchronize repositories with [hg-git](http://hg-git.github.io/)

Pull requests are welcome. Please read the [instructions on building the code](https://code.google.com/p/ganttproject/wiki/BuildingGanttProject).
28 changes: 28 additions & 0 deletions biz.ganttproject.core/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
apply plugin: 'java'

dependencies {
compile fileTree(dir: 'lib', include: ['*.jar'])
}

sourceSets {
main {
java {
srcDir 'src'
}
resources {
}
}
}

task copyPlugin(type: Copy) {
into(new File(rootProject.pluginsDir, project.name))
from(jar.outputs.getFiles().getFiles().flatten())
from(fileTree(".")) {
include "plugin.xml"
include "lib/**.jar"
include "resources/**"
}
doLast {
println "Copying $project.name to $rootProject.pluginsDir"
}
}
2 changes: 1 addition & 1 deletion biz.ganttproject.core/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
provider-name="">

<runtime>
<library name="ganttproject-core.jar">
<library name="biz.ganttproject.core.jar">
<export name="*"/>
</library>
<library name="lib/ganttproject-guava.jar">
Expand Down
29 changes: 29 additions & 0 deletions biz.ganttproject.impex.ical/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
apply plugin: 'java'
apply plugin: 'idea'

dependencies {
compile fileTree(dir: 'lib', include: ['*.jar'])
compile project(':..:ganttproject')
}

sourceSets {
main {
java {
srcDir 'src'
}
resources {
}
}
}

task copyPlugin(type: Copy) {
into(new File(rootProject.pluginsDir, project.name))
from(jar.outputs.getFiles().getFiles().flatten())
from(fileTree(".")) {
include "plugin.xml"
include "lib/**.jar"
}
doLast {
println "Copying $project.name to $rootProject.pluginsDir"
}
}
2 changes: 1 addition & 1 deletion biz.ganttproject.impex.ical/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
provider-name="">

<runtime>
<library name="ganttproject-ical.jar">
<library name="biz.ganttproject.impex.ical.jar">
<export name="*"/>
</library>
<library name="lib/backport-util-concurrent-3.1.jar">
Expand Down
29 changes: 29 additions & 0 deletions biz.ganttproject.impex.msproject2/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
apply plugin: 'java'
apply plugin: 'idea'

dependencies {
compile fileTree(dir: 'lib', include: ['*.jar'])
compile project(':..:ganttproject')
}

sourceSets {
main {
java {
srcDir 'src'
}
resources {
}
}
}

task copyPlugin(type: Copy) {
into(new File(rootProject.pluginsDir, project.name))
from(jar.outputs.getFiles().getFiles().flatten())
from(fileTree(".")) {
include "plugin.xml"
include "lib/**.jar"
}
doLast {
println "Copying $project.name to $rootProject.pluginsDir"
}
}
2 changes: 1 addition & 1 deletion biz.ganttproject.impex.msproject2/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
provider-name="">

<runtime>
<library name="ganttproject-msproject2.jar">
<library name="biz.ganttproject.impex.msproject2.jar">
<export name="*"/>
</library>
<library name="lib/">
Expand Down
2 changes: 2 additions & 0 deletions ganttproject-builder/Info.plist.patch
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
+ <string>GAN</string>
+ </array>
+ </dict>
<key>NSHighResolutionCapable</key>
<true/>
+ </dict>
+ </array>
<key>CFBundleDevelopmentRegion</key>
Expand Down
35 changes: 35 additions & 0 deletions ganttproject-builder/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import org.gradle.plugins.ide.idea.model.*

apply plugin: 'java'
apply plugin: 'idea'

ext.distBinDir = file('dist-bin')
ext.pluginsDir = file('dist-bin/plugins')

def javaProjects() {
subprojects.findAll { project ->
project.name != rootProject.name && project.path != ':..'
}
}

clean {
delete += "dist-bin"
}

task copyPlugin(type: Copy) {
into(rootProject.distBinDir)
from(fileTree(".")) {
include "lib/javagalician.jar"
include "logging.properties"
}
}
task distBin(dependsOn: getTasksByName('assemble', true) + getTasksByName('copyPlugin', true)) << {
println "== Finished building binary distro =="
}

idea {
project {
vcs = 'Git'
outputFile = new File(outputFile.parentFile, 'ganttproject.ipr')
}
}
2 changes: 1 addition & 1 deletion ganttproject-builder/settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':..:ganttproject','..:biz.ganttproject.core','..:biz.ganttproject.impex.msproject2','..:org.ganttproject.impex.htmlpdf','..:org.ganttproject.chart.pert'
include '..:ganttproject','..:biz.ganttproject.core','..:biz.ganttproject.impex.ical','..:biz.ganttproject.impex.msproject2','..:org.ganttproject.impex.htmlpdf','..:org.ganttproject.chart.pert'
43 changes: 43 additions & 0 deletions ganttproject/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
apply plugin: 'java'
apply plugin: 'idea'

dependencies {
compile fileTree(dir: 'lib/core', include: ['*.jar'])
compile project(':..:biz.ganttproject.core')
}

sourceSets {
main {
java {
srcDir 'src'
}
resources {
}
}
}

task copyPluginFiles(type: Copy) {
into(new File(rootProject.pluginsDir, project.name))
from(jar.outputs.getFiles().getFiles().flatten())
from(fileTree(".")) {
include "plugin.xml"
include "lib/core/**.jar"
exclude "lib/core/eclipsito.jar"
include "data/resources/**.properties"
include "data/resources/calendar/**"
include "data/resources/icons/**"
include "data/resources/language/**"
}
}

task copyEclipsito(type: Copy) {
into(rootProject.distBinDir)
from(fileTree("lib/core")) {
include "eclipsito.jar"
}
outputs.upToDateWhen {
new File(rootProject.distBinDir, "eclipsito.jar").exists()
}
}

task copyPlugin(dependsOn: ['copyPluginFiles', 'copyEclipsito']) << { println "Copying $project.name to $rootProject.pluginsDir" }
19 changes: 9 additions & 10 deletions ganttproject/lib/core/licenses/jdnc.LICENSE
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999

Copyright (C) 1991, 1999 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

[This is the first released version of the Lesser GPL. It also counts
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]

Preamble
Preamble

The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Expand Down Expand Up @@ -112,7 +112,7 @@ modification follow. Pay close attention to the difference between a
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.

GNU LESSER GENERAL PUBLIC LICENSE
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License Agreement applies to any software library or other
Expand Down Expand Up @@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.

1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
Expand Down Expand Up @@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

NO WARRANTY
NO WARRANTY

15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
Expand All @@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

END OF TERMS AND CONDITIONS
END OF TERMS AND CONDITIONS

How to Apply These Terms to Your New Libraries

Expand Down Expand Up @@ -485,7 +485,7 @@ convey the exclusion of warranty; and each file should have at least the

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

Also add information on how to contact you by electronic and paper mail.

Expand All @@ -500,4 +500,3 @@ necessary. Here is a sample; alter the names:
Ty Coon, President of Vice

That's all there is to it!

Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ public void initDefault() {
redline = false;
lockDAVMinutes = 240;
undoNumber = 50;
xslDir = GanttOptions.class.getResource("/xslt").toString();
xslFo = GanttOptions.class.getResource("/xslfo/ganttproject.xsl").toString();
xslDir = String.valueOf(GanttOptions.class.getResource("/xslt"));
xslFo = String.valueOf(GanttOptions.class.getResource("/xslfo/ganttproject.xsl"));
toolBarPosition = JToolBar.HORIZONTAL;
bShowStatusBar = true;
// must be 16 small, 24 for big (32 for extra big not directly include on
Expand Down
28 changes: 28 additions & 0 deletions org.ganttproject.chart.pert/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
apply plugin: 'java'
apply plugin: 'idea'

dependencies {
compile project(':..:ganttproject')
}

sourceSets {
main {
java {
srcDir 'src'
}
resources {
}
}
}

task copyPlugin(type: Copy) {
into(new File(rootProject.pluginsDir, project.name))
from(jar.outputs.getFiles().getFiles().flatten())
from(fileTree(".")) {
include "plugin.xml"
include "resources/**"
}
doLast {
println "Copying $project.name to $rootProject.pluginsDir"
}
}
2 changes: 1 addition & 1 deletion org.ganttproject.chart.pert/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
provider-name="">

<runtime>
<library name="pert.jar"/>
<library name="org.ganttproject.chart.pert.jar"/>
<library name="resources/">
<export name="*"/>
</library>
Expand Down
30 changes: 30 additions & 0 deletions org.ganttproject.impex.htmlpdf/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
apply plugin: 'java'
apply plugin: 'idea'

dependencies {
compile fileTree(dir: 'lib', include: ['*.jar'])
compile project(':..:ganttproject')
}

sourceSets {
main {
java {
srcDir 'src'
}
resources {
}
}
}

task copyPlugin(type: Copy) {
into(new File(rootProject.pluginsDir, project.name))
from(jar.outputs.getFiles().getFiles().flatten())
from(fileTree(".")) {
include "plugin.xml"
include "lib/**.jar"
include "resource/**.jar"
}
doLast {
println "Copying $project.name to $rootProject.pluginsDir"
}
}
2 changes: 1 addition & 1 deletion org.ganttproject.impex.htmlpdf/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
provider-name="ganttproject.org team">

<runtime>
<library name="ganttproject-htmlpdf.jar">
<library name="org.ganttproject.impex.htmlpdf.jar">
<export name="*"/>
</library>
<library name="lib/itextpdf-5.3.1.jar">
Expand Down
Loading