From 25f490484b2c1e886eb9a1562fa0b113df51c1ff Mon Sep 17 00:00:00 2001 From: Ethan Estrada Date: Wed, 4 Feb 2015 12:45:30 -0700 Subject: [PATCH 1/4] Move sized icons so they get picked up at buildtime --- resources/{linux => }/icons/1024.png | Bin resources/{linux => }/icons/128.png | Bin resources/{linux => }/icons/16.png | Bin resources/{linux => }/icons/24.png | Bin resources/{linux => }/icons/256.png | Bin resources/{linux => }/icons/32.png | Bin resources/{linux => }/icons/48.png | Bin resources/{linux => }/icons/512.png | Bin resources/{linux => }/icons/64.png | Bin 9 files changed, 0 insertions(+), 0 deletions(-) rename resources/{linux => }/icons/1024.png (100%) rename resources/{linux => }/icons/128.png (100%) rename resources/{linux => }/icons/16.png (100%) rename resources/{linux => }/icons/24.png (100%) rename resources/{linux => }/icons/256.png (100%) rename resources/{linux => }/icons/32.png (100%) rename resources/{linux => }/icons/48.png (100%) rename resources/{linux => }/icons/512.png (100%) rename resources/{linux => }/icons/64.png (100%) diff --git a/resources/linux/icons/1024.png b/resources/icons/1024.png similarity index 100% rename from resources/linux/icons/1024.png rename to resources/icons/1024.png diff --git a/resources/linux/icons/128.png b/resources/icons/128.png similarity index 100% rename from resources/linux/icons/128.png rename to resources/icons/128.png diff --git a/resources/linux/icons/16.png b/resources/icons/16.png similarity index 100% rename from resources/linux/icons/16.png rename to resources/icons/16.png diff --git a/resources/linux/icons/24.png b/resources/icons/24.png similarity index 100% rename from resources/linux/icons/24.png rename to resources/icons/24.png diff --git a/resources/linux/icons/256.png b/resources/icons/256.png similarity index 100% rename from resources/linux/icons/256.png rename to resources/icons/256.png diff --git a/resources/linux/icons/32.png b/resources/icons/32.png similarity index 100% rename from resources/linux/icons/32.png rename to resources/icons/32.png diff --git a/resources/linux/icons/48.png b/resources/icons/48.png similarity index 100% rename from resources/linux/icons/48.png rename to resources/icons/48.png diff --git a/resources/linux/icons/512.png b/resources/icons/512.png similarity index 100% rename from resources/linux/icons/512.png rename to resources/icons/512.png diff --git a/resources/linux/icons/64.png b/resources/icons/64.png similarity index 100% rename from resources/linux/icons/64.png rename to resources/icons/64.png From fc5a22a7837d990f372b03a04e08be5337d131b2 Mon Sep 17 00:00:00 2001 From: Ethan Estrada Date: Wed, 4 Feb 2015 12:55:59 -0700 Subject: [PATCH 2/4] Pick up icons from icon path in RPM package build --- build/tasks/mkrpm-task.coffee | 2 +- resources/linux/redhat/atom.spec.in | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build/tasks/mkrpm-task.coffee b/build/tasks/mkrpm-task.coffee index 8cec64196..8436fea7a 100644 --- a/build/tasks/mkrpm-task.coffee +++ b/build/tasks/mkrpm-task.coffee @@ -32,7 +32,7 @@ module.exports = (grunt) -> installDir = grunt.config.get('atom.installDir') shareDir = path.join(installDir, 'share', 'atom') - iconName = path.join(shareDir, 'resources', 'app', 'resources', 'atom.png') + iconName = 'atom' executable = 'atom' data = {name, version, description, installDir, iconName, executable} diff --git a/resources/linux/redhat/atom.spec.in b/resources/linux/redhat/atom.spec.in index 79dc9be40..d72d0c3df 100644 --- a/resources/linux/redhat/atom.spec.in +++ b/resources/linux/redhat/atom.spec.in @@ -20,8 +20,16 @@ chmod 755 %{buildroot}/<%= installDir %>/bin/atom mkdir -p %{buildroot}/<%= installDir %>/share/applications/ cp atom.desktop %{buildroot}/<%= installDir %>/share/applications/ +# copy over icons in sizes that most desktop environments like +for i in 1024 512 256 128 64 48 32 24 16 +do + mkdir -p %{buildroot}/<%= installDir %>/share/icons/hicolor/${i}x${i}/apps + cp Atom/resources/app/resources/icons/${i}.png %{buildroot}/<%= installDir %>/share/icons/hicolor/${i}x${i}/apps/atom.png +done + %files <%= installDir %>/bin/atom <%= installDir %>/bin/apm <%= installDir %>/share/atom/ <%= installDir %>/share/applications/atom.desktop +<%= installDir %>/share/icons/hicolor/ From 3a971a5a1a13a28fd310c4bc00997c2d08527758 Mon Sep 17 00:00:00 2001 From: Ethan Estrada Date: Fri, 6 Feb 2015 01:02:37 -0700 Subject: [PATCH 3/4] Move linux icons back to their original location --- resources/{ => linux}/icons/1024.png | Bin resources/{ => linux}/icons/128.png | Bin resources/{ => linux}/icons/16.png | Bin resources/{ => linux}/icons/24.png | Bin resources/{ => linux}/icons/256.png | Bin resources/{ => linux}/icons/32.png | Bin resources/{ => linux}/icons/48.png | Bin resources/{ => linux}/icons/512.png | Bin resources/{ => linux}/icons/64.png | Bin 9 files changed, 0 insertions(+), 0 deletions(-) rename resources/{ => linux}/icons/1024.png (100%) rename resources/{ => linux}/icons/128.png (100%) rename resources/{ => linux}/icons/16.png (100%) rename resources/{ => linux}/icons/24.png (100%) rename resources/{ => linux}/icons/256.png (100%) rename resources/{ => linux}/icons/32.png (100%) rename resources/{ => linux}/icons/48.png (100%) rename resources/{ => linux}/icons/512.png (100%) rename resources/{ => linux}/icons/64.png (100%) diff --git a/resources/icons/1024.png b/resources/linux/icons/1024.png similarity index 100% rename from resources/icons/1024.png rename to resources/linux/icons/1024.png diff --git a/resources/icons/128.png b/resources/linux/icons/128.png similarity index 100% rename from resources/icons/128.png rename to resources/linux/icons/128.png diff --git a/resources/icons/16.png b/resources/linux/icons/16.png similarity index 100% rename from resources/icons/16.png rename to resources/linux/icons/16.png diff --git a/resources/icons/24.png b/resources/linux/icons/24.png similarity index 100% rename from resources/icons/24.png rename to resources/linux/icons/24.png diff --git a/resources/icons/256.png b/resources/linux/icons/256.png similarity index 100% rename from resources/icons/256.png rename to resources/linux/icons/256.png diff --git a/resources/icons/32.png b/resources/linux/icons/32.png similarity index 100% rename from resources/icons/32.png rename to resources/linux/icons/32.png diff --git a/resources/icons/48.png b/resources/linux/icons/48.png similarity index 100% rename from resources/icons/48.png rename to resources/linux/icons/48.png diff --git a/resources/icons/512.png b/resources/linux/icons/512.png similarity index 100% rename from resources/icons/512.png rename to resources/linux/icons/512.png diff --git a/resources/icons/64.png b/resources/linux/icons/64.png similarity index 100% rename from resources/icons/64.png rename to resources/linux/icons/64.png From 5f2b5c3781c216fd5df7e8042cc44b081421c27c Mon Sep 17 00:00:00 2001 From: Ethan Estrada Date: Fri, 6 Feb 2015 01:06:28 -0700 Subject: [PATCH 4/4] Only copy icons to build location Linux icons are now only copied for build process, not for install process. They should be ignored for all platforms except RPM package build on Linux. --- build/tasks/build-task.coffee | 3 +++ resources/linux/redhat/atom.spec.in | 2 +- script/mkrpm | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee index f49e1ac49..fcb1eb6a8 100644 --- a/build/tasks/build-task.coffee +++ b/build/tasks/build-task.coffee @@ -160,6 +160,9 @@ module.exports = (grunt) -> cp path.join('resources', 'win', 'atom.js'), path.join(shellAppDir, 'resources', 'cli', 'atom.js') cp path.join('resources', 'win', 'apm.sh'), path.join(shellAppDir, 'resources', 'cli', 'apm.sh') + if process.platform is 'linux' + cp path.join('resources', 'linux', 'icons'), path.join(buildDir, 'icons') + dependencies = ['compile', 'generate-license:save', 'generate-module-cache', 'compile-packages-slug'] dependencies.push('copy-info-plist') if process.platform is 'darwin' dependencies.push('set-exe-icon') if process.platform is 'win32' diff --git a/resources/linux/redhat/atom.spec.in b/resources/linux/redhat/atom.spec.in index d72d0c3df..369aeea70 100644 --- a/resources/linux/redhat/atom.spec.in +++ b/resources/linux/redhat/atom.spec.in @@ -24,7 +24,7 @@ cp atom.desktop %{buildroot}/<%= installDir %>/share/applications/ for i in 1024 512 256 128 64 48 32 24 16 do mkdir -p %{buildroot}/<%= installDir %>/share/icons/hicolor/${i}x${i}/apps - cp Atom/resources/app/resources/icons/${i}.png %{buildroot}/<%= installDir %>/share/icons/hicolor/${i}x${i}/apps/atom.png + cp icons/${i}.png %{buildroot}/<%= installDir %>/share/icons/hicolor/${i}x${i}/apps/atom.png done %files diff --git a/script/mkrpm b/script/mkrpm index 34b0b1d6d..c9ba2d7f7 100755 --- a/script/mkrpm +++ b/script/mkrpm @@ -12,6 +12,7 @@ ARCH=`uname -m` rpmdev-setuptree cp -r $BUILD_DIRECTORY/Atom $RPM_BUILD_ROOT/BUILD +cp -r $BUILD_DIRECTORY/icons $RPM_BUILD_ROOT/BUILD cp $SPEC_FILE $RPM_BUILD_ROOT/SPECS cp ./atom.sh $RPM_BUILD_ROOT/BUILD cp $DESKTOP_FILE $RPM_BUILD_ROOT/BUILD