aedi: move zip target to tier 2

aedi/target/__init__.py

@@ -109,7 +109,7 @@ def targets():
         WxWidgetsTarget(),
         ZstdTarget(),
 
-        # Tools
+        # Tools needed to build main targets and libraries (tiers 1 and 2)
         BuildCMakeTarget(),
         GmakeTarget(),
         MesonTarget(),
@@ -120,6 +120,8 @@ def targets():
         PkgConfigTarget(),
         UnrarTarget(),
         YasmTarget(),
+
+        # Tools without binaries stored in the repo, can be outdated
         ZipTarget(),
 
         # Special

aedi/target/tool_tier1.py

@@ -205,23 +205,3 @@ class YasmTarget(ConfigureMakeDependencyTarget):
 
     def detect(self, state: BuildState) -> bool:
         return state.has_source_file('libyasm.h')
-
-
-class ZipTarget(SingleExeCTarget):
-    def __init__(self, name='zip'):
-        super().__init__(name)
-        self.options = (
-            '-I.', '-DUNIX', '-DBZIP2_SUPPORT', '-DLARGE_FILE_SUPPORT', '-DUNICODE_SUPPORT',
-            '-DHAVE_DIRENT_H', '-DHAVE_TERMIOS_H', '-lbz2',
-            'crc32.c', 'crypt.c', 'deflate.c', 'fileio.c', 'globals.c', 'trees.c',
-            'ttyio.c', 'unix/unix.c', 'util.c', 'zip.c', 'zipfile.c', 'zipup.c',
-        )
-
-    def prepare_source(self, state: BuildState):
-        state.download_source(
-            'https://downloads.sourceforge.net/project/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz',
-            'f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369',
-            patches='zip-fix-misc')
-
-    def detect(self, state: BuildState) -> bool:
-        return state.has_source_file('zip.h')

aedi/target/tool_tier2.py

@@ -15,3 +15,25 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+
+from .base import *
+
+
+class ZipTarget(SingleExeCTarget):
+    def __init__(self, name='zip'):
+        super().__init__(name)
+        self.options = (
+            '-I.', '-DUNIX', '-DBZIP2_SUPPORT', '-DLARGE_FILE_SUPPORT', '-DUNICODE_SUPPORT',
+            '-DHAVE_DIRENT_H', '-DHAVE_TERMIOS_H', '-lbz2',
+            'crc32.c', 'crypt.c', 'deflate.c', 'fileio.c', 'globals.c', 'trees.c',
+            'ttyio.c', 'unix/unix.c', 'util.c', 'zip.c', 'zipfile.c', 'zipup.c',
+        )
+
+    def prepare_source(self, state: BuildState):
+        state.download_source(
+            'https://downloads.sourceforge.net/project/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz',
+            'f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369',
+            patches='zip-fix-misc')
+
+    def detect(self, state: BuildState) -> bool:
+        return state.has_source_file('zip.h')