Update file copying script to adapt SPM support

onevcat · Aug 30, 2019 · a35a86e · a35a86e
1 parent 0781bd1
commit a35a86e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/APNGKit.xcodeproj/project.pbxproj b/APNGKit.xcodeproj/project.pbxproj
@@ -692,7 +692,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "ruby ./sync-libpng-apng";
+			shellScript = "ruby ./sync-libpng-apng\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/sync-libpng-apng b/sync-libpng-apng
@@ -4,9 +4,15 @@ require 'fileutils'
 
 exit unless File.directory?("./libpng-apng/") && Dir.entries('./libpng-apng/').include?("png.c")
 
-files = ["png.c", "png.h", "pngconf.h", "pngdebug.h", "pngerror.c", "pngget.c", "pnginfo.h", "pngmem.c", "pngpread.c", "pngpriv.h", "pngread.c", "pngrio.c", "pngrtran.c", "pngrutil.c", "pngset.c", "pngstruct.h", "pngtrans.c", "pngwio.c", "pngwrite.c", "pngwtran.c", "pngwutil.c", "arm/filter_neon_intrinsics.c", "arm/filter_neon.S", "arm/arm_init.c"]
+files = ["png.c", "pngdebug.h", "pngerror.c", "pngget.c", "pnginfo.h", "pngmem.c", "pngpread.c", "pngpriv.h", "pngread.c", "pngrio.c", "pngrtran.c", "pngrutil.c", "pngset.c", "pngstruct.h", "pngtrans.c", "pngwio.c", "pngwrite.c", "pngwtran.c", "pngwutil.c", "arm/filter_neon_intrinsics.c", "arm/filter_neon.S", "arm/arm_init.c"]
+files.map! { |file| "./libpng-apng/" + file}
 
-files.map! {|file| "./libpng-apng/" + file}
+include_files = ["pngconf.h", "png.h"]
+include_files.map! { |file| "./libpng-apng/" + file}
+
+FileUtils.mkdir_p './APNGKit/libpng-apng/include'
 
 FileUtils.cp files, './APNGKit/libpng-apng'
-FileUtils.cp './libpng-apng/scripts/pnglibconf.h.prebuilt', './APNGKit/libpng-apng/pnglibconf.h'
+FileUtils.cp include_files, './APNGKit/libpng-apng/include'
+
+FileUtils.cp './libpng-apng/scripts/pnglibconf.h.prebuilt', './APNGKit/libpng-apng/include/pnglibconf.h'