- 
          
 - 
                Notifications
    
You must be signed in to change notification settings  - Fork 880
 
Feat appimage pack #6839
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
          
     Open
      
      
            RubMaker
  wants to merge
  13
  commits into
  xmake-io:dev
  
    
      
        
          
  
    
      Choose a base branch
      
     
    
      
        
      
      
        
          
          
        
        
          
            
              
              
              
  
           
        
        
          
            
              
              
           
        
       
     
  
        
          
            
          
            
          
        
       
    
      
from
RubMaker:feat-appimage
  
      
      
   
  
    
  
  
  
 
  
      
    base: dev
Could not load branches
            
              
  
    Branch not found: {{ refName }}
  
            
                
      Loading
              
            Could not load tags
            
            
              Nothing to show
            
              
  
            
                
      Loading
              
            Are you sure you want to change the base?
            Some commits from the old base branch may be removed from the timeline,
            and old review comments may become outdated.
          
          
      
        
          +480
        
        
          −3
        
        
          
        
      
    
  
  
     Open
                    Feat appimage pack #6839
Changes from all commits
      Commits
    
    
            Show all changes
          
          
            13 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      5e2c151
              
                init
              
              
                RubMaker 2ccccd3
              
                add appimage pack for common and qt
              
              
                RubMaker bc12c5b
              
                dmg with print
              
              
                RubMaker cbbed63
              
                add dmg pack qt and common
              
              
                RubMaker 9e3fa0e
              
                remove a print for dmg
              
              
                RubMaker 03b71c0
              
                remove some print
              
              
                RubMaker ede5c71
              
                remove dmg part
              
              
                RubMaker 1735608
              
                some modify for appimage
              
              
                RubMaker fad2554
              
                modified appimage pack
              
              
                RubMaker 0e2fb5a
              
                remove qt pack appimage
              
              
                RubMaker 5b12257
              
                remove qt func
              
              
                RubMaker 8f30de8
              
                a version can run
              
              
                RubMaker 22ad6db
              
                rebuidl appdir for appimage
              
              
                RubMaker File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
There are no files selected for viewing
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| --!A cross-platform build utility based on Lua | ||
| -- | ||
| -- Licensed under the Apache License, Version 2.0 (the "License"); | ||
| -- you may not use this file except in compliance with the License. | ||
| -- You may obtain a copy of the License at | ||
| -- | ||
| -- http://www.apache.org/licenses/LICENSE-2.0 | ||
| -- | ||
| -- Unless required by applicable law or agreed to in writing, software | ||
| -- distributed under the License is distributed on an "AS IS" BASIS, | ||
| -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| -- See the License for the specific language governing permissions and | ||
| -- limitations under the License. | ||
| -- | ||
| -- Copyright (C) 2015-present, Xmake Open Source Community. | ||
| -- | ||
| -- @author RubMaker | ||
| -- @file find_appimagetool.lua | ||
| -- | ||
| 
     | 
||
| -- imports | ||
| import("lib.detect.find_program") | ||
| import("lib.detect.find_programver") | ||
| 
     | 
||
| -- find appimagetool | ||
| -- | ||
| -- @param opt the argument options, e.g. {version = true} | ||
| -- | ||
| -- @return program | ||
| -- | ||
| -- @code | ||
| -- | ||
| -- local appimagetool = find_appimagetool() | ||
| -- | ||
| -- @endcode | ||
| -- | ||
| function main(opt) | ||
| -- init options | ||
| opt = opt or {} | ||
| 
     | 
||
| -- add common appimagetool installation paths if no specific program is given | ||
| if not opt.program then | ||
| opt.paths = opt.paths or {} | ||
| local appimagetool_paths = { | ||
| "/usr/bin", -- standard system path | ||
| "/usr/local/bin", -- local installation | ||
| "/opt/appimagetool", -- custom installation directory | ||
| path.join(os.getenv("HOME") or "~", ".local/bin") -- user local bin | ||
| } | ||
| 
     | 
||
| opt.paths = table.wrap(opt.paths) | ||
| for _, apppath in ipairs(appimagetool_paths) do | ||
| table.insert(opt.paths, apppath) | ||
| end | ||
| end | ||
| 
     | 
||
| -- find program | ||
| local program = find_program(opt.program or "appimagetool", opt) | ||
| return program | ||
| end | 
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| --!A cross-platform build utility based on Lua | ||
| -- | ||
| -- Licensed under the Apache License, Version 2.0 (the "License"); | ||
| -- you may not use this file except in compliance with the License. | ||
| -- You may obtain a copy of the License at | ||
| -- | ||
| -- http://www.apache.org/licenses/LICENSE-2.0 | ||
| -- | ||
| -- Unless required by applicable law or agreed to in writing, software | ||
| -- distributed under the License is distributed on an "AS IS" BASIS, | ||
| -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| -- See the License for the specific language governing permissions and | ||
| -- limitations under the License. | ||
| -- | ||
| -- Copyright (C) 2015-present, Xmake Open Source Community. | ||
| -- | ||
| 
         There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 删了  | 
||
| -- @author RubMaker | ||
| -- @file find_linuxdeploy.lua | ||
| -- | ||
| 
     | 
||
| -- imports | ||
| import("lib.detect.find_program") | ||
| import("lib.detect.find_programver") | ||
| 
     | 
||
| -- find linuxdeploy | ||
| -- | ||
| -- @param opt the argument options, e.g. {version = true} | ||
| -- | ||
| -- @return program, version | ||
| -- | ||
| -- @code | ||
| -- | ||
| -- local linuxdeploy = find_linuxdeploy() | ||
| -- | ||
| -- @endcode | ||
| -- | ||
| function main(opt) | ||
| -- init options | ||
| opt = opt or {} | ||
| 
     | 
||
| -- add common linuxdeploy installation paths if no specific program is given | ||
| if not opt.program then | ||
| opt.paths = opt.paths or {} | ||
| local homedir = os.getenv("HOME") or "~" | ||
| local linuxdeploy_paths = { | ||
| "/usr/local/bin", -- standard system path | ||
| "/usr/bin", -- system binary path | ||
| "/opt/linuxdeploy", -- custom installation directory | ||
| path.join(homedir, ".local/bin"), -- user local bin | ||
| path.join(homedir, "bin"), -- user bin | ||
| path.join(homedir, "Downloads"), -- common download location | ||
| path.join(homedir, "downloads"), -- lowercase download location | ||
| os.tmpdir(), -- temporary directory | ||
| "/snap/bin", -- snap packages | ||
| "/var/lib/flatpak/exports/bin", -- flatpak system | ||
| path.join(homedir, ".local/share/flatpak/exports/bin"), -- flatpak user | ||
| path.join(os.curdir(), "tools"), -- project tools directory | ||
| path.join(os.curdir(), "bin") -- project bin directory | ||
| } | ||
| 
     | 
||
| opt.paths = table.wrap(opt.paths) | ||
| for _, deploypath in ipairs(linuxdeploy_paths) do | ||
| table.insert(opt.paths, deploypath) | ||
| end | ||
| end | ||
| 
     | 
||
| -- find program | ||
| local program = find_program(opt.program or "linuxdeploy", opt) | ||
| return program | ||
| end | ||
      
      Oops, something went wrong.
        
    
  
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里也是
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里还没改