Merge pull request #456 from ctapmex/colorer-change-scheme

FarColorer: use latest 'allpacked' colorer schemes
FarGroup · Oct 17, 2021 · ca8594f · ca8594f
2 parents 9f16ce9 + 0736839
commit ca8594f
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 443 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -104,15 +104,23 @@ build_script:
   - set COLORER_PLATFORM=x86
   - if "%platform%" == "x64" set COLORER_PLATFORM=x64
   - set COLORER_BASE_NAME=FarColorer.%COLORER_PLATFORM%.v%COLORER_VERSION%
-  - set COLORER_FILE_NAME=%COLORER_BASE_NAME%.7z
+  - set COLORER_FILE_NAME=%COLORER_BASE_NAME%.wobase.7z
   - set COLORER_PDB_NAME=%COLORER_BASE_NAME%.pdb.7z
   - set COLORER_BASE_URL=https://github.com/colorer/FarColorer/releases/download/v%COLORER_VERSION%/
   - curl -fsLJO %COLORER_BASE_URL%%COLORER_FILE_NAME%
   - curl -fsLJO %COLORER_BASE_URL%%COLORER_PDB_NAME%
+  #download colorer schemes
+  - curl --silent "https://api.github.com/repos/colorer/Colorer-schemes/releases/latest" | grep '"tag_name":' | sed -E 's/.*^"v([^^^"]+)^".*/\1/' > TEMP
+  - set /p COLORER_SCHEMES_VERSION=<TEMP
+  - echo "Download colorer schemes %COLORER_SCHEMES_VERSION%"
+  - set COLORER_SCHEMES_FILE_NAME=colorer-base.allpacked.%COLORER_SCHEMES_VERSION%.zip
+  - set COLORER_SCHEMES_BASE_URL=https://github.com/colorer/Colorer-schemes/releases/download/v%COLORER_SCHEMES_VERSION%/
+  - curl -fsLJO %COLORER_SCHEMES_BASE_URL%%COLORER_SCHEMES_FILE_NAME%
   - set COLORER_DIR=ci\%configuration%.%platform%\Plugins\FarColorer
   - mkdir %COLORER_DIR%
   - 7z x %COLORER_FILE_NAME% -o%COLORER_DIR%
   - 7z x %COLORER_PDB_NAME% -o%COLORER_DIR%\bin
+  - 7z x %COLORER_SCHEMES_FILE_NAME% -o%COLORER_DIR%\base
   #remove not needed build artifacts
   - ps: Get-ChildItem ci\${Env:configuration}`.${Env:platform}\ -recurse -File | Where-Object { @(".lib", ".exp", ".ilk") -contains $_.extension } | Remove-Item
 

diff --git a/misc/msi-installer/features.wxs b/misc/msi-installer/features.wxs
@@ -625,93 +625,7 @@
           <ComponentRef Id="Plugin.Colorer.lua" />
           <Feature Id="FarColorer.Ignore.base" Level="1" Display="hidden" AllowAdvertise="no">
             <ComponentRef Id="catalog.xml" />
-            <Feature Id="FarColorer.Ignore.base_hrc" Level="1" Display="hidden" AllowAdvertise="no">
-              <ComponentRef Id="php_prot.ent.hrc" />
-              <ComponentRef Id="proto.hrc" />
-              <ComponentRef Id="rare.gen.ent.hrc" />
-              <ComponentRef Id="rare.ie_weidu.ent.hrc" />
-              <ComponentRef Id="rare.j2ee.ent.hrc" />
-              <ComponentRef Id="rare.qrm.ent.hrc" />
-              <ComponentRef Id="rare.scripts.ent.hrc" />
-              <ComponentRef Id="scripts.colorer.ent.hrc" />
-              <ComponentRef Id="scripts.far.ent.hrc" />
-              <ComponentRef Id="scripts.ini.ent.hrc" />
-              <ComponentRef Id="scripts.msg.ent.hrc" />
-              <ComponentRef Id="common.jar" />
-              <Feature Id="FarColorer.Ignore.base_hrc_auto" Level="1" Display="hidden" AllowAdvertise="no">
-                <ComponentRef Id="types" />
-                <ComponentRef Id="empty.hrc" />
-              </Feature>
-            </Feature>
-            <Feature Id="FarColorer.Ignore.base_hrd" Level="1" Display="hidden" AllowAdvertise="no">
-              <ComponentRef Id="catalog_console.xml" />
-              <ComponentRef Id="catalog_rgb.xml" />
-              <ComponentRef Id="catalog_text.xml" />
-              <Feature Id="FarColorer.Ignore.base_hrd_console" Level="1" Display="hidden" AllowAdvertise="no">
-                <ComponentRef Id="black.hrd" />
-                <ComponentRef Id="blue.hrd" />
-                <ComponentRef Id="default.hrd" />
-                <ComponentRef Id="dnlike.hrd" />
-                <ComponentRef Id="gray.hrd" />
-                <ComponentRef Id="hack.hrd" />
-                <ComponentRef Id="mirror.hrd" />
-                <ComponentRef Id="nc.hrd" />
-                <ComponentRef Id="white.hrd" />
-                <ComponentRef Id="xmastree.hrd" />
-                <Feature Id="FarColorer.Ignore.base_hrd_console_con" Level="1" Display="hidden" AllowAdvertise="no">
-                  <ComponentRef Id="black_ay.hrd" />
-                  <ComponentRef Id="black_sezal.hrd" />
-                  <ComponentRef Id="classic.hrd" />
-                  <ComponentRef Id="cyberpunk.hrd" />
-                  <ComponentRef Id="gray_pult.hrd" />
-                  <ComponentRef Id="ocean.hrd" />
-                  <ComponentRef Id="take4.hrd" />
-                  <ComponentRef Id="visual.hrd" />
-                </Feature>
-                <Feature Id="FarColorer.Ignore.base_hrd_console_emu" Level="1" Display="hidden" AllowAdvertise="no">
-                  <ComponentRef Id="mirror.hrd_2" />
-                </Feature>
-              </Feature>
-              <Feature Id="FarColorer.Ignore.base_hrd_css" Level="1" Display="hidden" AllowAdvertise="no">
-                 <ComponentRef Id="black.css" />
-                 <ComponentRef Id="blue.css" />
-                 <ComponentRef Id="eclipse.css" />
-                 <ComponentRef Id="grayscale.css" />
-                 <ComponentRef Id="hs.css" />
-                 <ComponentRef Id="mirice.css" />
-                 <ComponentRef Id="mirror.css" />
-                 <ComponentRef Id="navy.css" />
-                 <ComponentRef Id="neo.css" />
-                 <ComponentRef Id="white.css" />
-                <Feature Id="FarColorer.Ignore.base_hrd_css_contrib" Level="1" Display="hidden" AllowAdvertise="no">
-                  <ComponentRef Id="bred3.css" />
-                  <ComponentRef Id="fmx.css" />
-                  <ComponentRef Id="visual_rgb.css" />
-                </Feature>
-              </Feature>
-              <Feature Id="FarColorer.Ignore.base_hrd_rgb" Level="1" Display="hidden" AllowAdvertise="no">
-                <ComponentRef Id="black.hrd_2" />
-                <ComponentRef Id="blue.hrd_2" />
-                <ComponentRef Id="eclipse.hrd" />
-                <ComponentRef Id="grayscale.hrd" />
-                <ComponentRef Id="hs.hrd" />
-                <ComponentRef Id="mirice.hrd" />
-                <ComponentRef Id="mirror.hrd_3" />
-                <ComponentRef Id="navy.hrd" />
-                <ComponentRef Id="neo.hrd" />
-                <ComponentRef Id="white.hrd_2" />
-                <Feature Id="FarColorer.Ignore.base_hrd_rgb_contrib" Level="1" Display="hidden" AllowAdvertise="no">
-                  <ComponentRef Id="bred3.hrd" />
-                  <ComponentRef Id="fmx.hrd" />
-                  <ComponentRef Id="visual_rgb.hrd" />
-                  <ComponentRef Id="navy_mirror.hrd" />
-                </Feature>
-              </Feature>
-              <Feature Id="FarColorer.Ignore.base_hrd_text" Level="1" Display="hidden" AllowAdvertise="no">
-                <ComponentRef Id="htmlcss.hrd" />
-                <ComponentRef Id="tags.hrd" />
-              </Feature>
-            </Feature>
+            <ComponentRef Id="common.zip" />
           </Feature>
           <Feature Id="FarColorer.Russian" Level="1" Display="hidden" AllowAdvertise="no">
             <ComponentRef Id="colorerr.hlf" />
@@ -722,7 +636,7 @@
           </Feature>
           <Feature Id="FarColorer.Changelogs" Level="1" Display="hidden" AllowAdvertise="no">
             <ComponentRef Id="history.ru.txt" />
-            <ComponentRef Id="CHANGELOG_21" />
+            <ComponentRef Id="CHANGELOG.md" />
           </Feature>
         </Feature>
         <Feature Id="FARCmds" Level="1" Title="!(loc.Feature.Title.FARCmds)" AllowAdvertise="no" Description="!(loc.Feature.Description.FARCmds)">